Small fixes for TARGET_JVM test scripts.

svn path=/trunk/mcs/; revision=65350

diff --git a/mcs/class/System.Data.OracleClient/ChangeLog b/mcs/class/System.Data.OracleClient/ChangeLog
index 67936e6be69e4ceaf938c45b6ca698c83a37df97..cc53864b8241a3798633ca0408046bde8f04b8d6 100644 (file)
--- a/mcs/class/System.Data.OracleClient/ChangeLog
+++ b/mcs/class/System.Data.OracleClient/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-12     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.test.bat: small fixes for TARGET_JVM test scripts.
+
 2006-09-13     Leszek Ciesielski <skolima@gmail.com>
 
        * OracleCommand.cs

diff --git a/mcs/class/System.Data.OracleClient/run-tests.test.bat b/mcs/class/System.Data.OracleClient/run-tests.test.bat
index 6920e0d6d085fbeec1216aa292f5d12b532d77ae..c3195d3fec989caf99b840def9d0ad3ec3042ff4 100644 (file)
--- a/mcs/class/System.Data.OracleClient/run-tests.test.bat
+++ b/mcs/class/System.Data.OracleClient/run-tests.test.bat
@@ -32,13 +32,16 @@ REM ********************************************************
 set BUILD_OPTION=%1\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 DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
+set TIMEL=%time:~0,2%_%time:~3,2%\r
+set TIMESTAMP=%DATEL%_%TIMEL%\r
+\r
 \r
 REM ********************************************************\r
 REM @echo Set environment\r
@@ -58,13 +61,9 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\ojdbc14.jar
 \r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
+set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
+set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
+set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r
@@ -89,9 +88,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
@@ -105,7 +114,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
@@ -130,11 +138,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
@@ -156,4 +159,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