Author: borisk
Date: 2006-09-13 09:23:18 -0400 (Wed, 13 Sep 2006)
New Revision: 65350
Modified:
trunk/mcs/class/System.Data.OracleClient/ChangeLog
trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat
Log:
Small fixes for TARGET_JVM test scripts.
Modified: trunk/mcs/class/System.Data.OracleClient/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/ChangeLog 2006-09-13 13:15:44 UTC
(rev 65349)
+++ trunk/mcs/class/System.Data.OracleClient/ChangeLog 2006-09-13 13:23:18 UTC
(rev 65350)
@@ -1,3 +1,7 @@
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+
+ * run-tests.test.bat: small fixes for TARGET_JVM test scripts.
+
2006-09-13 Leszek Ciesielski <[EMAIL PROTECTED]>
* OracleCommand.cs
Modified: trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat 2006-09-13
13:15:44 UTC (rev 65349)
+++ trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat 2006-09-13
13:23:18 UTC (rev 65350)
@@ -32,14 +32,17 @@
set BUILD_OPTION=%1
set OUTPUT_FILE_PREFIX=System.Data.OracleClient
set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient
-
set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln
set TEST_ASSEMBLY=System.Data.OracleClient.Tests20.J2EE.jar
set PROJECT_CONFIGURATION=Debug_Java20
set APP_CONFIG_FILE=Test\System.Data.OracleClient.J2EE.config
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%
+set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%
+set TIMEL=%time:~0,2%_%time:~3,2%
+set TIMESTAMP=%DATEL%_%TIMEL%
+
+
REM ********************************************************
REM @echo Set environment
REM ********************************************************
@@ -58,14 +61,10 @@
set NUNIT_OPTIONS=/exclude=NotWorking
-set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%
-set TIMEL=%time:~0,2%_%time:~3,2%
-set TIMESTAMP=%DATEL%_%TIMEL%
+set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml
+set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log
+set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml
-set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt
-set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt
-
set NUNIT_PATH=..\..\nunit20\
set
NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar
set
NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar
@@ -89,9 +88,19 @@
@echo Building NUnit solution...
REM ********************************************************
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
+
REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION%
%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+goto NUNITREADY
+
+:NUNITSKIP
+echo Skipping NUnit Build...
+
+:NUNITREADY
+set NUNIT_BUILD=DONE
+
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
REM ********************************************************
@@ -105,7 +114,6 @@
copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
copy %APP_CONFIG_FILE% nunit-console.exe.config
-
REM @echo on
"%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
REM @echo off
@@ -130,11 +138,6 @@
@echo off
:FINALLY
-
-copy %RUN_LOG% ..\
-copy %BUILD_LOG% ..\
-copy %GH_OUTPUT_XML% ..\
-
GOTO END
:ENVIRONMENT_EXCEPTION
@@ -156,4 +159,8 @@
GOTO END
:END
+copy %RUN_LOG% ..\
+copy %BUILD_LOG% ..\
+copy %GH_OUTPUT_XML% ..\
+
REM EXIT 0
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
