change GHROOT to VMW_HOME

[mono.git] / mcs / class / System.Data.OracleClient / run-tests.test.bat

diff --git a/mcs/class/System.Data.OracleClient/run-tests.test.bat b/mcs/class/System.Data.OracleClient/run-tests.test.bat
index 78f673a0634368563e608c02826f02d7b7376289..392a0f7d95b4ea79ceb01992bacae37aaa440257 100644 (file)
--- a/mcs/class/System.Data.OracleClient/run-tests.test.bat
+++ b/mcs/class/System.Data.OracleClient/run-tests.test.bat
@@ -30,15 +30,24 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=System.Data.OracleClient\r
+set OUTPUT_FILE_PREFIX=System_Data_OracleClient\r
 set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient\r
-\r
 set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln\r
 set TEST_ASSEMBLY=System.Data.OracleClient.Tests20.J2EE.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 set APP_CONFIG_FILE=Test\System.Data.OracleClient.J2EE.config\r
 \r
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%\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
@@ -54,13 +63,18 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.OracleClient.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\ojdbc14.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\ojdbc14.jar\r
 \r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml\r
-set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt\r
-set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\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
@@ -85,9 +99,19 @@ REM ********************************************************
 @echo Building NUnit solution...\r
 REM ********************************************************\r
 \r
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
+\r
 REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %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
+:NUNITSKIP\r
+echo Skipping NUnit Build...\r
+\r
+:NUNITREADY\r
+set NUNIT_BUILD=DONE\r
+\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
@@ -101,7 +125,6 @@ REM ********************************************************
 copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
 copy %APP_CONFIG_FILE% nunit-console.exe.config\r
 \r
-\r
 REM @echo on\r
 "%JAVA_HOME%\bin\java" -Xmx1024M -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
@@ -126,11 +149,6 @@ xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
 @echo off\r
 \r
 :FINALLY\r
-\r
-copy %RUN_LOG% ..\\r
-copy %BUILD_LOG% ..\\r
-copy %GH_OUTPUT_XML% ..\\r
-\r
 GOTO END\r
 \r
 :ENVIRONMENT_EXCEPTION\r
@@ -152,4 +170,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