Author: borisk
Date: 2006-09-13 09:44:19 -0400 (Wed, 13 Sep 2006)
New Revision: 65352
Modified:
trunk/mcs/class/System.XML/ChangeLog
trunk/mcs/class/System.XML/run-W3C-tests.bat
trunk/mcs/class/System.XML/run-XSLT-tests.bat
trunk/mcs/class/System.XML/run-tests.bat
Log:
Reworked test scripts for TARGET_JVM.
Modified: trunk/mcs/class/System.XML/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/ChangeLog 2006-09-13 13:30:05 UTC (rev
65351)
+++ trunk/mcs/class/System.XML/ChangeLog 2006-09-13 13:44:19 UTC (rev
65352)
@@ -1,3 +1,7 @@
+2006-09-13 Boris Kirzner <[EMAIL PROTECTED]>
+ * run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat:
+ reworked test scripts for TARGET_JVM.
+
2006-09-06 Merav Sudri <[EMAIL PROTECTED]>
* run-W3C-tests.bat - Update nunit build and XMLTool actions
Modified: trunk/mcs/class/System.XML/run-W3C-tests.bat
===================================================================
--- trunk/mcs/class/System.XML/run-W3C-tests.bat 2006-09-13 13:30:05 UTC
(rev 65351)
+++ trunk/mcs/class/System.XML/run-W3C-tests.bat 2006-09-13 13:44:19 UTC
(rev 65352)
@@ -1,4 +1,4 @@
-rem @echo off
[EMAIL PROTECTED] off
REM ********************************************************
REM This batch file receives the follwing parameters:
REM build/rebuild (optional): should the solution file be rebuilded
@@ -7,69 +7,72 @@
REM will cause to build (and not rebuild) test solutions,
REM ********************************************************
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+IF "%1"=="" GOTO USAGE
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-IF "%GHROOT%"=="" set GHROOT=%GH_HOME%
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-REM ********************************************************
-REM Set parameters
-REM ********************************************************
+
IF "%1"=="" (
set BUILD_OPTION=rebuild
) ELSE (
set BUILD_OPTION=%1
)
-set OUTPUT_FILE_PREFIX=GH_TEST
-
REM ********************************************************
-REM @echo Set environment
+REM Set parameters
REM ********************************************************
-set JGAC_PATH=%GH_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;
-set NUNIT_OPTIONS=/fixture=MonoTests.W3C_xmlconf.CleanTests
+set BUILD_OPTION=%1
+set OUTPUT_FILE_PREFIX=System.XML.W3C
+set RUNNING_FIXTURE=MonoTests.W3C_xmlconf.CleanTests
+set TEST_SOLUTION=W3c20.J2EE.sln
+set TEST_ASSEMBLY=W3C.jar
set PROJECT_CONFIGURATION=Debug_Java20
-set GH_OUTPUT_XML=W3C_nunit_results.xml
-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 CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
-set W3C_DIR=Test\System.Xml\W3C\
-pushd %W3C_DIR%
+set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%
+set TIMEL=%time:~0,2%_%time:~3,2%
+set TIMESTAMP=%DATEL%_%TIMEL%
+
+
REM ********************************************************
[EMAIL PROTECTED] Building NUnit solution...
+REM @echo Set environment
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
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JAVA_HOME=%VMW_HOME%\jre5
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+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%J2SE.Helpers.jar
+set NUNIT_OPTIONS=/exclude=NotWorking
-set NUNIT_BUILD=DONE
+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
-:NUNITSKIP
-echo Skipping NUnit Build...
+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%"
+set W3C_DIR=Test\System.Xml\W3C
+pushd %W3C_DIR%
REM ********************************************************
[EMAIL PROTECTED] Build XmlTool
[EMAIL PROTECTED] Building GH solution...
REM ********************************************************
-set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool
-msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt
2<&1
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-copy %XML_TOOL_PATH%\bin\Debug\xmltool20.exe ..\..\..
-copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..
+del %TEST_ASSEMBLY%
-REM ********************************************************
[EMAIL PROTECTED] Building GH solution...
-REM ********************************************************
-del W3C.jar
-msbuild W3c20.J2EE.sln /t:%BUILD_OPTION%
/p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
REM ********************************************************
@@ -83,19 +86,54 @@
unzip -un xmlts20031210.zip
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+REM ********************************************************
[EMAIL PROTECTED] Building NUnit solution...
+REM ********************************************************
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
+
+
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION%
/p:configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+goto NUNITREADY
+
+:NUNITSKIP
+echo Skipping NUnit Build...
+
+:NUNITREADY
+set NUNIT_BUILD=DONE
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
REM ********************************************************
@echo Running GH tests...
REM ********************************************************
[EMAIL PROTECTED] on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi
W3C.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >run.log.txt 2<&1
[EMAIL PROTECTED] off
+REM ********************************************************
[EMAIL PROTECTED] Running fixture "%RUNNING_FIXTURE%"
+REM ********************************************************
+
+REM @echo on
+"%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
+REM @echo off
+
popd
copy %W3C_DIR%\%GH_OUTPUT_XML% .
+copy %W3C_DIR%\%RUN_LOG% .
REM ********************************************************
[EMAIL PROTECTED] 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
REM ********************************************************
@echo on
@@ -111,12 +149,21 @@
:BUILD_EXCEPTION
popd
[EMAIL PROTECTED] Error in building solutions. See build.log.txt for details...
[EMAIL PROTECTED] Error in building solutions. See %BUILD_LOG% for details...
GOTO END
:RUN_EXCEPTION
popd
[EMAIL PROTECTED] Error in running fixture. See run.log.txt for details...
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for
details...
GOTO END
+:USAGE
[EMAIL PROTECTED] 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
Modified: trunk/mcs/class/System.XML/run-XSLT-tests.bat
===================================================================
--- trunk/mcs/class/System.XML/run-XSLT-tests.bat 2006-09-13 13:30:05 UTC
(rev 65351)
+++ trunk/mcs/class/System.XML/run-XSLT-tests.bat 2006-09-13 13:44:19 UTC
(rev 65352)
@@ -1,4 +1,4 @@
-rem @echo off
[EMAIL PROTECTED] off
REM ********************************************************
REM This batch file receives the follwing parameters:
REM build/rebuild (optional): should the solution file be rebuilded
@@ -7,71 +7,72 @@
REM will cause to build (and not rebuild) test solutions,
REM ********************************************************
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+IF "%1"=="" GOTO USAGE
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-IF "%GHROOT%"=="" set GHROOT=%GH_HOME%
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-REM ********************************************************
-REM Set parameters
-REM ********************************************************
+
IF "%1"=="" (
set BUILD_OPTION=rebuild
) ELSE (
set BUILD_OPTION=%1
)
-set OUTPUT_FILE_PREFIX=GH_TEST
-
REM ********************************************************
-REM @echo Set environment
+REM Set parameters
REM ********************************************************
-set JGAC_PATH=%GH_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;
-set NUNIT_OPTIONS=/fixture=MonoTests.oasis_xslt.SuiteBuilder /include=Clean
+set BUILD_OPTION=%1
+set OUTPUT_FILE_PREFIX=System.XML.XSLT
+set RUNNING_FIXTURE=MonoTests.oasis_xslt.SuiteBuilder
+set TEST_SOLUTION=xslt20.J2EE.sln
+set TEST_ASSEMBLY=xslt.jar
set PROJECT_CONFIGURATION=Debug_Java20
-set GH_OUTPUT_XML=XSLT_nunit_results.xml
-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 CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
-set XSLT_DIR=Test\System.Xml.XSL\standalone_tests\
-pushd %XSLT_DIR%
-IF "%BUILD_OPTION%"=="nobuild" GOTO RUN
+set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%
+set TIMEL=%time:~0,2%_%time:~3,2%
+set TIMESTAMP=%DATEL%_%TIMEL%
+
+
REM ********************************************************
[EMAIL PROTECTED] Building NUnit solution...
+REM @echo Set environment
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
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JAVA_HOME=%VMW_HOME%\jre5
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+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%J2SE.Helpers.jar
+set NUNIT_OPTIONS=/include=Clean
-goto NUNITREADY
+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
-:NUNITSKIP
-echo Skipping NUnit Build...
+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%
-:NUNITREADY
-set NUNIT_BUILD=DONE
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
+set XSLT_DIR=Test\System.Xml.XSL\standalone_tests\
+pushd %XSLT_DIR%
+IF "%BUILD_OPTION%"=="nobuild" GOTO RUN
REM ********************************************************
[EMAIL PROTECTED] Build XmlTool
[EMAIL PROTECTED] Building GH solution...
REM ********************************************************
-set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool
-msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt
2<&1
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool20.exe ..\..\..
-copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..
-REM ********************************************************
[EMAIL PROTECTED] Building GH solution...
-REM ********************************************************
-msbuild xslt20.J2EE.sln /t:%BUILD_OPTION%
/p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
REM ********************************************************
@@ -92,26 +93,59 @@
patch -p0 -i catalog-fixed.diff
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+REM ********************************************************
[EMAIL PROTECTED] Building NUnit solution...
+REM ********************************************************
+
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
+
+
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION%
/p:configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+goto NUNITREADY
+
+:NUNITSKIP
+echo Skipping NUnit Build...
+
+:NUNITREADY
+set NUNIT_BUILD=DONE
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
:RUN
REM ********************************************************
@echo Running GH tests...
REM ********************************************************
-del %GH_OUTPUT_XML%
[EMAIL PROTECTED] on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi
xslt.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >run.log.txt 2<&1
[EMAIL PROTECTED] off
+REM ********************************************************
[EMAIL PROTECTED] Running fixture "%RUNNING_FIXTURE%"
+REM ********************************************************
+REM @echo on
+"%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
+REM @echo off
+
popd
-del %GH_OUTPUT_XML%
copy %XSLT_DIR%\%GH_OUTPUT_XML% .
+copy %XSLT_DIR%\%RUN_LOG% .
REM ********************************************************
[EMAIL PROTECTED] 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
REM ********************************************************
@echo on
-xmltool20.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
+xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
@echo off
:FINALLY
@@ -123,11 +157,21 @@
:BUILD_EXCEPTION
popd
[EMAIL PROTECTED] Error in building solutions. See build.log.txt for details...
[EMAIL PROTECTED] Error in building solutions. See %BUILD_LOG% for details...
GOTO END
:RUN_EXCEPTION
[EMAIL PROTECTED] Error in running fixture. See run.log.txt for details...
+
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for
details...
GOTO END
+:USAGE
[EMAIL PROTECTED] 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
Modified: trunk/mcs/class/System.XML/run-tests.bat
===================================================================
--- trunk/mcs/class/System.XML/run-tests.bat 2006-09-13 13:30:05 UTC (rev
65351)
+++ trunk/mcs/class/System.XML/run-tests.bat 2006-09-13 13:44:19 UTC (rev
65352)
@@ -7,5 +7,5 @@
REM will cause to build (and not rebuild) test solutions,
REM ********************************************************
-call run-W3C-tests.bat
-call run-XSLT-tests.bat
+call run-W3C-tests.bat rebuild
+call run-XSLT-tests.bat rebuild
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
