Author: borisk
Date: 2006-09-13 09:00:38 -0400 (Wed, 13 Sep 2006)
New Revision: 65347
Modified:
trunk/mcs/class/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/run-tests.test.bat
Log:
Small fixes for TARGET_JVM.
Modified: trunk/mcs/class/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/ChangeLog 2006-09-13 10:58:29 UTC
(rev 65346)
+++ trunk/mcs/class/System.Configuration/ChangeLog 2006-09-13 13:00:38 UTC
(rev 65347)
@@ -4,6 +4,10 @@
2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
+ * run-tests.test.bat : small fixes for TARGET_JVM.
+
+2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
+
* run-tests.bat, run-tests.test.bat: added scripts for NET_2_0
TARGET_JVM tests.
Modified: trunk/mcs/class/System.Configuration/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.Configuration/run-tests.test.bat 2006-09-13
10:58:29 UTC (rev 65346)
+++ trunk/mcs/class/System.Configuration/run-tests.test.bat 2006-09-13
13:00:38 UTC (rev 65347)
@@ -15,11 +15,10 @@
IF "%1"=="" GOTO USAGE
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-
IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+
IF "%1"=="" (
set BUILD_OPTION=rebuild
) ELSE (
@@ -31,14 +30,14 @@
REM ********************************************************
set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Configuration.MonoTests
+set OUTPUT_FILE_PREFIX=System.Configuration
set RUNNING_FIXTURE=MonoTests.System.Configuration
set TEST_SOLUTION=Test\System.Configuration.Test20.sln
set TEST_ASSEMBLY=System.Configuration.Test20.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%
@@ -48,16 +47,26 @@
REM ********************************************************
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.Configuration.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
set NUNIT_OPTIONS=/exclude=NotWorking
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.%TIMESTAMP%.xml
-set
BUILD_LOG=%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt
-set RUN_LOG=%OUTPUT_FILE_PREFIX%.GH.%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,14 +132,10 @@
@echo off
:FINALLY
-
-copy %RUN_LOG% ..\
-copy %BUILD_LOG% ..\
-copy %GH_OUTPUT_XML% ..\
GOTO END
:ENVIRONMENT_EXCEPTION
[EMAIL PROTECTED] This test requires environment variables JAVA_HOME and
VMW_HOME to be defined
[EMAIL PROTECTED] This test requires environment variable VMW_HOME to be defined
GOTO END
:BUILD_EXCEPTION
@@ -148,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
