projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #1949 from lewurm/fixtype
[mono.git] / mcs / class / System.DirectoryServices / run-tests.test.bat
diff --git a/mcs/class/System.DirectoryServices/run-tests.test.bat b/mcs/class/System.DirectoryServices/run-tests.test.bat
index 6804d27a7cadef44edc67a7318e7e02cdf60ceae..75aff8320ce928986b50392704863a5f2df6a5c4 100644 (file)
--- a/mcs/class/System.DirectoryServices/run-tests.test.bat
+++ b/mcs/class/System.DirectoryServices/run-tests.test.bat
@@ -1,4 +1,4 @@
-@echo on\r
+@echo off\r
 REM ********************************************************\r
 REM This batch file receives the follwing parameters:\r
 REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -12,12 +12,17 @@ REM running Test.Sys.Drawing fixture
 REM with output files named GhTests.Net.xml and GhTests.GH.xml\r
 REM ********************************************************\r
 \r
-\r
 IF "%1"=="" GOTO USAGE\r
 \r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+\r
 \r
-IF "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+\r
+IF "%1"=="" (\r
+       set BUILD_OPTION=rebuild\r
+) ELSE (\r
+       set BUILD_OPTION=%1\r
+)\r
 \r
 REM ********************************************************\r
 REM Set parameters\r
@@ -31,40 +36,71 @@ set TEST_SOLUTION=Test\System.DirectoryServices.Test20.sln
 set TEST_ASSEMBLY=System.DirectoryServices.Test20.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
+set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%_%SECURE_MODE%\r
+\r
+set startDate=%date%\r
+set startTime=%time%\r
+set sdy=%startDate:~10%\r
+set /a sdm=1%startDate:~4,2% - 100\r
+set /a sdd=1%startDate:~7,2% - 100\r
+set /a sth=%startTime:~0,2%\r
+set /a stm=1%startTime:~3,2% - 100\r
+set /a sts=1%startTime:~6,2% - 100\r
+set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%\r
+\r
 \r
 REM ********************************************************\r
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\\r
+set JAVA_HOME=%VMW_HOME%\jre\r
 \r
-set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.DirectoryServices.jar;%JGAC_PATH%Novell.Directory.Ldap.jar;%JGAC_PATH%J2SE.Helpers.jar\r
+set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Configuration.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.DirectoryServices.jar;\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%Novell.Directory.Ldap.jar;\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.%SECURE_MODE%.xml\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
 \r
-set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\\r
-set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar;.\r
-set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
+\r
+set NUNIT_PATH=..\..\nunit20\\r
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%\r
 \r
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
 \r
 REM ********************************************************\r
-REM @echo Building GH solution...\r
+@echo Building GH solution...\r
 REM ********************************************************\r
 \r
 rem devenv Test\System.DirectoryServices.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
-REM @echo Building NUnit solution...\r
+@echo Building NUnit solution...\r
 REM ********************************************************\r
 \r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
 \r
 rem devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 goto NUNITREADY\r
 \r
@@ -77,11 +113,11 @@ set NUNIT_BUILD=DONE
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
-REM @echo Running GH tests...\r
+@echo Running GH tests...\r
 REM ********************************************************\r
 \r
 REM ********************************************************\r
-REM @echo Running fixture "%RUNNING_FIXTURE%"\r
+@echo Running fixture "%RUNNING_FIXTURE%"\r
 REM ********************************************************\r
 \r
 copy Test\bin\Debug_Java20\%TEST_ASSEMBLY% .\r
@@ -95,43 +131,53 @@ IF "%SECURE_MODE%" NEQ "secure" (
 )\r
 \r
 REM @echo on\r
-"%JAVA_HOME%\bin\java" %JVM_OPTIONS%  -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1\r
+"%JAVA_HOME%\bin\java" %JVM_OPTIONS%  -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
 REM @echo off\r
 \r
-\r
 REM ********************************************************\r
-REM @echo Build XmlTool\r
+@echo Build XmlTool\r
 REM ********************************************************\r
 set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
+\r
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP\r
+\r
 rem devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe .\r
+goto XMLTOOLREADY\r
+\r
+:XMLTOOLSKIP\r
+echo Skipping XmlToll build...\r
+\r
+:XMLTOOLREADY\r
+set XMLTOOL_BUILD=DONE\r
+\r
+copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt .\r
 \r
 REM ********************************************************\r
-REM @echo Analyze and print results\r
+@echo Analyze and print results\r
 REM ********************************************************\r
-REM @echo on\r
+@echo on\r
 xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%\r
-REM @echo off\r
+@echo off\r
 \r
 :FINALLY\r
 GOTO END\r
 \r
 :ENVIRONMENT_EXCEPTION\r
-@echo This test requires environment variables JAVA_HOME and GHROOT to be defined\r
+@echo This test requires environment variable VMW_HOME to be defined\r
 GOTO END\r
 \r
 :BUILD_EXCEPTION\r
-@echo Error in building solutions. See %RUNNING_FIXTURE%_build.log.txt for details...\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
 REM EXIT 1\r
 GOTO END\r
 \r
 :RUN_EXCEPTION\r
-@echo Error in running fixture %RUNNING_FIXTURE%. See %RUNNING_FIXTURE%_run.log.txt for details...\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...\r
 REM EXIT 1\r
 GOTO END\r
 \r
@@ -140,4 +186,8 @@ GOTO END
 GOTO END\r
 \r
 :END\r
+copy %RUN_LOG% ..\\r
+copy %BUILD_LOG% ..\\r
+copy %GH_OUTPUT_XML% ..\\r
+\r
 REM EXIT 0\r
my mono mirror. check out Moved to http://github.com/mono/mono