+2006-09-13 Boris Kirzner <borisk@mainsoft.com>
+ * run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat:
+ reworked test scripts for TARGET_JVM.
+
2006-09-06 Merav Sudri <meravs@mainsoft.com>
* run-W3C-tests.bat - Update nunit build and XMLTool actions
-rem @echo off\r
+@echo off\r
REM ********************************************************\r
REM This batch file receives the follwing parameters:\r
REM build/rebuild (optional): should the solution file be rebuilded \r
REM will cause to build (and not rebuild) test solutions,\r
REM ********************************************************\r
\r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%1"=="" GOTO USAGE\r
+\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
\r
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
-IF "%GHROOT%"=="" set GHROOT=%GH_HOME%\r
\r
-REM ********************************************************\r
-REM Set parameters\r
-REM ********************************************************\r
\r
IF "%1"=="" (\r
set BUILD_OPTION=rebuild\r
) ELSE (\r
set BUILD_OPTION=%1\r
)\r
-set OUTPUT_FILE_PREFIX=GH_TEST\r
-\r
\r
REM ********************************************************\r
-REM @echo Set environment\r
+REM Set parameters\r
REM ********************************************************\r
\r
-set JGAC_PATH=%GH_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;\r
-set NUNIT_OPTIONS=/fixture=MonoTests.W3C_xmlconf.CleanTests\r
+set BUILD_OPTION=%1\r
+set OUTPUT_FILE_PREFIX=System.XML.W3C\r
+set RUNNING_FIXTURE=MonoTests.W3C_xmlconf.CleanTests\r
+set TEST_SOLUTION=W3c20.J2EE.sln\r
+set TEST_ASSEMBLY=W3C.jar\r
set PROJECT_CONFIGURATION=Debug_Java20\r
-set GH_OUTPUT_XML=W3C_nunit_results.xml\r
-set NUNIT_PATH=..\..\..\..\..\nunit20\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 CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
-set W3C_DIR=Test\System.Xml\W3C\\r
\r
-pushd %W3C_DIR%\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
-@echo Building NUnit solution...\r
+REM @echo Set environment\r
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
-\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JAVA_HOME=%VMW_HOME%\jre5\r
\r
-set NUNIT_BUILD=DONE\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%J2SE.Helpers.jar\r
+set NUNIT_OPTIONS=/exclude=NotWorking\r
\r
-:NUNITSKIP\r
-echo Skipping NUnit Build...\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
+set W3C_DIR=Test\System.Xml\W3C\r
\r
-REM ********************************************************\r
-@echo Build XmlTool\r
-REM ********************************************************\r
-set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool\r
-msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-copy %XML_TOOL_PATH%\bin\Debug\xmltool20.exe ..\..\..\r
-copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..\r
+pushd %W3C_DIR%\r
\r
REM ********************************************************\r
@echo Building GH solution...\r
REM ********************************************************\r
-del W3C.jar\r
-msbuild W3c20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1\r
+del %TEST_ASSEMBLY%\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
REM ********************************************************\r
unzip -un xmlts20031210.zip\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
+REM ********************************************************\r
+@echo Building NUnit solution...\r
+REM ********************************************************\r
+\r
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
+\r
+\r
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+\r
+goto NUNITREADY\r
+\r
+:NUNITSKIP\r
+echo Skipping NUnit Build...\r
+\r
+:NUNITREADY\r
+set NUNIT_BUILD=DONE\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
REM ********************************************************\r
@echo Running GH tests...\r
REM ********************************************************\r
-@echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >run.log.txt 2<&1\r
-@echo off\r
+\r
+REM ********************************************************\r
+@echo Running fixture "%RUNNING_FIXTURE%"\r
+REM ********************************************************\r
+\r
+REM @echo on\r
+"%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\r
+REM @echo off\r
\r
popd\r
\r
copy %W3C_DIR%\%GH_OUTPUT_XML% .\r
+copy %W3C_DIR%\%RUN_LOG% .\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
+\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
\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
GOTO END\r
\r
:RUN_EXCEPTION\r
popd\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
+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
-rem @echo off\r
+@echo off\r
REM ********************************************************\r
REM This batch file receives the follwing parameters:\r
REM build/rebuild (optional): should the solution file be rebuilded \r
REM will cause to build (and not rebuild) test solutions,\r
REM ********************************************************\r
\r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%1"=="" GOTO USAGE\r
+\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
\r
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
-IF "%GHROOT%"=="" set GHROOT=%GH_HOME%\r
\r
-REM ********************************************************\r
-REM Set parameters\r
-REM ********************************************************\r
\r
IF "%1"=="" (\r
set BUILD_OPTION=rebuild\r
) ELSE (\r
set BUILD_OPTION=%1\r
)\r
-set OUTPUT_FILE_PREFIX=GH_TEST\r
-\r
\r
REM ********************************************************\r
-REM @echo Set environment\r
+REM Set parameters\r
REM ********************************************************\r
\r
-set JGAC_PATH=%GH_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;\r
-set NUNIT_OPTIONS=/fixture=MonoTests.oasis_xslt.SuiteBuilder /include=Clean\r
+set BUILD_OPTION=%1\r
+set OUTPUT_FILE_PREFIX=System.XML.XSLT\r
+set RUNNING_FIXTURE=MonoTests.oasis_xslt.SuiteBuilder\r
+set TEST_SOLUTION=xslt20.J2EE.sln\r
+set TEST_ASSEMBLY=xslt.jar\r
set PROJECT_CONFIGURATION=Debug_Java20\r
-set GH_OUTPUT_XML=XSLT_nunit_results.xml\r
-set NUNIT_PATH=..\..\..\..\..\nunit20\\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 CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
-set XSLT_DIR=Test\System.Xml.XSL\standalone_tests\\r
\r
-pushd %XSLT_DIR%\r
-IF "%BUILD_OPTION%"=="nobuild" GOTO RUN\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
-@echo Building NUnit solution...\r
+REM @echo Set environment\r
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
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JAVA_HOME=%VMW_HOME%\jre5\r
\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-\r
-goto NUNITREADY\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%J2SE.Helpers.jar\r
+set NUNIT_OPTIONS=/include=Clean\r
\r
-:NUNITSKIP\r
-echo Skipping NUnit Build...\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
-:NUNITREADY\r
-set NUNIT_BUILD=DONE\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
+set XSLT_DIR=Test\System.Xml.XSL\standalone_tests\\r
\r
-REM ********************************************************\r
-@echo Build XmlTool\r
-REM ********************************************************\r
-set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool\r
-msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool20.exe ..\..\..\r
-copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..\r
+pushd %XSLT_DIR%\r
+IF "%BUILD_OPTION%"=="nobuild" GOTO RUN\r
\r
REM ********************************************************\r
@echo Building GH solution...\r
REM ********************************************************\r
-msbuild xslt20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1\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
REM ********************************************************\r
patch -p0 -i catalog-fixed.diff\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
+REM ********************************************************\r
+@echo Building NUnit solution...\r
+REM ********************************************************\r
+\r
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
+\r
+\r
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+\r
+goto NUNITREADY\r
+\r
+:NUNITSKIP\r
+echo Skipping NUnit Build...\r
+\r
+:NUNITREADY\r
+set NUNIT_BUILD=DONE\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
:RUN\r
REM ********************************************************\r
@echo Running GH tests...\r
REM ********************************************************\r
\r
-del %GH_OUTPUT_XML%\r
-@echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi xslt.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >run.log.txt 2<&1\r
-@echo off\r
+REM ********************************************************\r
+@echo Running fixture "%RUNNING_FIXTURE%"\r
+REM ********************************************************\r
+\r
+REM @echo on\r
+"%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\r
+REM @echo off\r
\r
popd\r
\r
-del %GH_OUTPUT_XML%\r
copy %XSLT_DIR%\%GH_OUTPUT_XML% .\r
+copy %XSLT_DIR%\%RUN_LOG% .\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
+\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
REM ********************************************************\r
@echo on\r
-xmltool20.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%\r
+xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%\r
@echo off\r
\r
:FINALLY\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
GOTO END\r
\r
:RUN_EXCEPTION\r
-@echo Error in running fixture. See run.log.txt for details...\r
+\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...\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
REM will cause to build (and not rebuild) test solutions,\r
REM ********************************************************\r
\r
-call run-W3C-tests.bat\r
-call run-XSLT-tests.bat\r
+call run-W3C-tests.bat rebuild\r
+call run-XSLT-tests.bat rebuild\r
projects / mono.git / commitdiff