Author: borisk
Date: 2006-09-13 09:09:05 -0400 (Wed, 13 Sep 2006)
New Revision: 65348
Modified:
trunk/mcs/class/System.Data/ChangeLog
trunk/mcs/class/System.Data/run-tests.test.connected.bat
trunk/mcs/class/System.Data/run-tests.test.disconnected.bat
Log:
Small fixes for TARGET_JVM test scripts.
Modified: trunk/mcs/class/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/ChangeLog 2006-09-13 13:00:38 UTC (rev
65347)
+++ trunk/mcs/class/System.Data/ChangeLog 2006-09-13 13:09:05 UTC (rev
65348)
@@ -1,5 +1,9 @@
2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
* run-tests.test.connected.bat, run-tests.test.disconnected.bat:
+ small fixes for TARGET_JVM test scrips.
+
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+ * run-tests.test.connected.bat, run-tests.test.disconnected.bat:
reworked logging options for TARGET_JVM tests.
2006-07-17 Senganal T <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/System.Data/run-tests.test.connected.bat
===================================================================
--- trunk/mcs/class/System.Data/run-tests.test.connected.bat 2006-09-13
13:00:38 UTC (rev 65347)
+++ trunk/mcs/class/System.Data/run-tests.test.connected.bat 2006-09-13
13:09:05 UTC (rev 65348)
@@ -30,17 +30,19 @@
REM ********************************************************
set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Data
+set OUTPUT_FILE_PREFIX=System.Data.connected
set RUNNING_FIXTURE=MonoTests.System.Data
-
set TEST_SOLUTION=Test\ProviderTests\System.Data.OleDb.Tests20.J2EE.sln
set TEST_ASSEMBLY=System.Data.OleDb.Tests.J2EE.jar
set PROJECT_CONFIGURATION=Debug_Java20
set APP_CONFIG_FILE=Test\ProviderTests\System.Data.OleDb.J2EE.config
-set RUN_ID=connected
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.%RUN_ID%
+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 ********************************************************
@@ -69,9 +71,9 @@
set NUNIT_OPTIONS=/exclude=NotWorking
-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 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 NUNIT_PATH=..\..\nunit20\
set
NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar
@@ -122,7 +124,6 @@
copy Test\ProviderTests\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
@@ -147,11 +148,6 @@
@echo off
:FINALLY
-
-copy %RUN_LOG% ..\
-copy %BUILD_LOG% ..\
-copy %GH_OUTPUT_XML% ..\
-
GOTO END
:ENVIRONMENT_EXCEPTION
@@ -173,4 +169,8 @@
GOTO END
:END
+copy %RUN_LOG% ..\
+copy %BUILD_LOG% ..\
+copy %GH_OUTPUT_XML% ..\
+
REM EXIT 0
Modified: trunk/mcs/class/System.Data/run-tests.test.disconnected.bat
===================================================================
--- trunk/mcs/class/System.Data/run-tests.test.disconnected.bat 2006-09-13
13:00:38 UTC (rev 65347)
+++ trunk/mcs/class/System.Data/run-tests.test.disconnected.bat 2006-09-13
13:09:05 UTC (rev 65348)
@@ -30,17 +30,17 @@
REM ********************************************************
set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Data
+set OUTPUT_FILE_PREFIX=System.Data.disconnected
set RUNNING_FIXTURE=MonoTests.System.Data
set TEST_SOLUTION=Test\System.Data.Test20.sln
set TEST_ASSEMBLY=System.Data.Test.jar
set PROJECT_CONFIGURATION=Debug_Java20
-set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%
+
+set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%
set TIMEL=%time:~0,2%_%time:~3,2%
set TIMESTAMP=%DATEL%_%TIMEL%
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.disconnected
REM ********************************************************
REM @echo Set environment
@@ -49,15 +49,24 @@
set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
set JAVA_HOME=%VMW_HOME%\jre5
-set
RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Data.jar;%JGAC_PATH%J2SE.Helpers.jar
+set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
set NUNIT_OPTIONS=/exclude=NotWorking
-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 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 NUNIT_PATH=..\..\nunit20\
-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
+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
+set
NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar
+set
NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%
set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
@@ -123,11 +132,6 @@
@echo off
:FINALLY
-
-copy %RUN_LOG% ..\
-copy %BUILD_LOG% ..\
-copy %GH_OUTPUT_XML% ..\
-
GOTO END
:ENVIRONMENT_EXCEPTION
@@ -149,4 +153,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
