Fixes for TARGET_JVM tests run.

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

mcs/class/System.Web/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-14	Boris Kirzner <[email protected]>
+
+	* run-mono-tests.bat: fixes for TARGET_JVM tests run.
+	
 2006-04-09	Boris Kirzner <[email protected]>
 
 	* run-mono-tests.bat: fixes for TARGET_JVM NET_2_0 tests run.

mcs/class/System.Web/run-mono-tests.bat

@@ -1,4 +1,4 @@
-@echo off
+@echo oî
 REM ********************************************************
 REM This batch file receives the follwing parameters:
 REM build/rebuild (optional): should the solution file be rebuilded 
@@ -7,36 +7,73 @@ REM example run-tests build
 REM will cause to build (and not rebuild) test solutions,
 REM ********************************************************
 
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-
 IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
 
-REM ********************************************************
-REM Set parameters
-REM ********************************************************
+
 
 IF "%1"=="" (
-	set BUILD_OPTION=rebuild
+	set BUILD_OPTION=build
 ) ELSE (
 	set BUILD_OPTION=%1
 )
-set OUTPUT_FILE_PREFIX=GH_TEST
+
+REM ********************************************************
+REM Set parameters
+REM ********************************************************
+
+set OUTPUT_FILE_PREFIX=System.Web
+set RUNNING_FIXTURE=System.Web
+set TEST_SOLUTION=Test\TestMonoWeb.J2EE20.sln
+set TEST_ASSEMBLY=TestMonoWeb.jar
+set PROJECT_CONFIGURATION=Debug_Java20
+
+
+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 ********************************************************
 
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110
-set RUNTIME_CLASSPATH=%JGAC_PATH%\mscorlib.jar;%JGAC_PATH%\System.jar;%JGAC_PATH%\System.Xml.jar;%JGAC_PATH%\J2SE.Helpers.jar;%JGAC_PATH%\System.Web.jar;%JGAC_PATH%\System.Drawing.jar;%JGAC_PATH%\System.Runtime.Serialization.Formatters.Soap.jar
-set PROJECT_CONFIGURATION=Debug_Java20
-set GH_OUTPUT_XML=nunit_results.xml
-set NUNIT_PATH=..\..\..\nunit20
-set XML_TOOL_PATH=..\..\..\tools\mono-xmltool
-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 JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JAVA_HOME=%VMW_HOME%\jre5
+
+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.Web.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Runtime.Serialization.Formatters.Soap.jar
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Drawing.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
+
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\NunitWeb.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\HtmlCompare.jar
+set NUNIT_OPTIONS=/exclude=NotWorking
+
+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
+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%"
 
-pushd Test
+REM ********************************************************
+@echo Building GH solution...
+REM ********************************************************
+
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
 IF "%BUILD_OPTION%"=="nobuild" GOTO RUN
 
 REM ********************************************************
@@ -44,7 +81,7 @@ REM ********************************************************
 REM ********************************************************
 
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
-msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >build.log.txt 2<&1
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
 
 goto NUNITREADY
 
@@ -56,34 +93,32 @@ set NUNIT_BUILD=DONE
 
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
+:RUN
 REM ********************************************************
-@echo Build XmlTool
+@echo Running GH tests...
 REM ********************************************************
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-
-copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe ..
-copy %XML_TOOL_PATH%\nunit_transform.xslt ..
 
 REM ********************************************************
-@echo Building GH solution...
+@echo Running fixture "%RUNNING_FIXTURE%"
 REM ********************************************************
-msbuild TestMonoWeb.J2EE20.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
-:RUN
-REM ********************************************************
-@echo Running GH tests...
-REM ********************************************************
+copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
 
-del %GH_OUTPUT_XML%
-@echo on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi bin/%PROJECT_CONFIGURATION%/TestMonoWeb.jar /xml=%GH_OUTPUT_XML% /exclude=ValueAdd,InetAccess,CAS,NotWorking  >run.log.txt 2<&1
-@echo off
+REM @echo on
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
+REM @echo off
 
-popd
 
-copy Test\bin\%PROJECT_CONFIGURATION%\%GH_OUTPUT_XML% .
+
+REM ********************************************************
+@echo Build XmlTool
+REM ********************************************************
+set XML_TOOL_PATH=..\..\tools\mono-xmltool
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
+copy %XML_TOOL_PATH%\nunit_transform.xslt .
 
 REM ********************************************************
 @echo Analyze and print results
@@ -96,16 +131,26 @@ xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
 GOTO END
 
 :ENVIRONMENT_EXCEPTION
-@echo This test requires environment variables JAVA_HOME and GH_HOME to be defined
+@echo This test requires environment variable VMW_HOME to be defined
 GOTO END
 
 :BUILD_EXCEPTION
-popd
-@echo Error in building solutions. See build.log.txt for details...
+@echo Error in building solutions. See %BUILD_LOG% for details...
+REM EXIT 1
 GOTO END
 
 :RUN_EXCEPTION
-@echo Error in running fixture. See run.log.txt for details...
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...
+REM EXIT 1
+GOTO END
+
+:USAGE
+@echo Parameters: "[build|rebuild] <output_file_name_prefix> <test_fixture> <relative_Working_directory> <back_path (..\..\.....) >"
 GOTO END
 
 :END
+copy %RUN_LOG% ..\
+copy %BUILD_LOG% ..\
+copy %GH_OUTPUT_XML% ..\
+
+REM EXIT 0