Fixes for TARGET_JVM tests run.

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

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 8bc6e0d166f8d57be94fe268f4c41c2e99d98df2..175163892e81e43d7efbb0f519b16c33b6116b80 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-14     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-mono-tests.bat: fixes for TARGET_JVM tests run.
+       
 2006-04-09     Boris Kirzner <borisk@mainsoft.com>
 
        * run-mono-tests.bat: fixes for TARGET_JVM NET_2_0 tests run.

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