Author: borisk
Date: 2006-09-13 09:30:05 -0400 (Wed, 13 Sep 2006)
New Revision: 65351
Modified:
trunk/mcs/class/System.DirectoryServices/ChangeLog
trunk/mcs/class/System.DirectoryServices/run-tests.test.bat
Log:
Small fixes for TARGET_JVM test scripts.
Modified: trunk/mcs/class/System.DirectoryServices/ChangeLog
===================================================================
--- trunk/mcs/class/System.DirectoryServices/ChangeLog 2006-09-13 13:23:18 UTC
(rev 65350)
+++ trunk/mcs/class/System.DirectoryServices/ChangeLog 2006-09-13 13:30:05 UTC
(rev 65351)
@@ -1,3 +1,7 @@
+2006-13-09 Boris Kirzner <[EMAIL PROTECTED]>
+
+ * run-tests.test.bat: small fixes for TARGET_JVM test scripts.
+
2006-11-09 Boris Kirzner <[EMAIL PROTECTED]>
* run-tests.test.bat: added timestamp to log file namies.
Modified: trunk/mcs/class/System.DirectoryServices/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.DirectoryServices/run-tests.test.bat 2006-09-13
13:23:18 UTC (rev 65350)
+++ trunk/mcs/class/System.DirectoryServices/run-tests.test.bat 2006-09-13
13:30:05 UTC (rev 65351)
@@ -12,13 +12,18 @@
REM with output files named GhTests.Net.xml and GhTests.GH.xml
REM ********************************************************
-
IF "%1"=="" GOTO USAGE
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-IF "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION
+
+IF "%1"=="" (
+ set BUILD_OPTION=rebuild
+) ELSE (
+ set BUILD_OPTION=%1
+)
+
REM ********************************************************
REM Set parameters
REM ********************************************************
@@ -31,7 +36,9 @@
set TEST_ASSEMBLY=System.DirectoryServices.Test20.jar
set PROJECT_CONFIGURATION=Debug_Java20
-set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%
+set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.%SECURE_MODE%
+
+set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%
set TIMEL=%time:~0,2%_%time:~3,2%
set TIMESTAMP=%DATEL%_%TIMEL%
@@ -40,22 +47,34 @@
REM @echo Set environment
REM ********************************************************
-set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\
+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.DirectoryServices.jar;%JGAC_PATH%Novell.Directory.Ldap.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
RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.DirectoryServices.jar;
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%Novell.Directory.Ldap.jar;
set NUNIT_OPTIONS=/exclude=NotWorking
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.%SECURE_MODE%.%TIMESTAMP%.xml
-set
BUILD_LOG=%OUTPUT_FILE_PREFIX%.GH.%SECURE_MODE%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt
-set
RUN_LOG=%OUTPUT_FILE_PREFIX%.GH.%SECURE_MODE%.%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=%BACK_TO_ROOT_DIR%..\..\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_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
+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%"
-
REM ********************************************************
-REM @echo Building GH solution...
[EMAIL PROTECTED] Building GH solution...
REM ********************************************************
rem devenv Test\System.DirectoryServices.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
@@ -64,7 +83,7 @@
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
REM ********************************************************
-REM @echo Building NUnit solution...
[EMAIL PROTECTED] Building NUnit solution...
REM ********************************************************
if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
@@ -83,11 +102,11 @@
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
REM ********************************************************
-REM @echo Running GH tests...
[EMAIL PROTECTED] Running GH tests...
REM ********************************************************
REM ********************************************************
-REM @echo Running fixture "%RUNNING_FIXTURE%"
[EMAIL PROTECTED] Running fixture "%RUNNING_FIXTURE%"
REM ********************************************************
copy Test\bin\Debug_Java20\%TEST_ASSEMBLY% .
@@ -104,9 +123,8 @@
"%JAVA_HOME%\bin\java" %JVM_OPTIONS% -cp %CLASSPATH% NUnit.Console.ConsoleUi
%TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS%
/xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
REM @echo off
-
REM ********************************************************
-REM @echo Build XmlTool
[EMAIL PROTECTED] Build XmlTool
REM ********************************************************
set XML_TOOL_PATH=..\..\tools\mono-xmltool
rem devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
@@ -118,22 +136,17 @@
copy %XML_TOOL_PATH%\nunit_transform.xslt .
REM ********************************************************
-REM @echo Analyze and print results
[EMAIL PROTECTED] Analyze and print results
REM ********************************************************
-REM @echo on
[EMAIL PROTECTED] on
xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
-REM @echo off
[EMAIL PROTECTED] off
-copy %RUN_LOG% ..\
-copy %BUILD_LOG% ..\
-copy %GH_OUTPUT_XML% ..\
-
-
:FINALLY
GOTO END
:ENVIRONMENT_EXCEPTION
[EMAIL PROTECTED] This test requires environment variables JAVA_HOME and GHROOT
to be defined
[EMAIL PROTECTED] This test requires environment variable VMW_HOME to be defined
GOTO END
:BUILD_EXCEPTION
@@ -151,4 +164,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
