Added batch files for automatic testing for TARGET_JVM.

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

diff --git a/mcs/class/System.Drawing/ChangeLog b/mcs/class/System.Drawing/ChangeLog
index 71cdde616f8d6ed9d558f2627606395ff0f41c0d..66fe6dcd694758b5ad45cc1ecd3c9efe8196a35b 100644 (file)
--- a/mcs/class/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-29 Boris Kirzner <borisk@mainsoft.com>
+       * run-tests.bat, run-tests.test.bat, runtestfixture.bat, 
+       runmonotestfixture.bat : added batch files for automatic 
+       testing for TARGET_JVM.
+
 2006-01-18  Sebastien Pouliot  <sebastien@ximian.com>
 
        * System.Drawing_test.dll.sources: Added unit tests for RegionData and

diff --git a/mcs/class/System.Drawing/run-tests.bat b/mcs/class/System.Drawing/run-tests.bat
new file mode 100644 (file)
index 0000000..9ea5669
--- /dev/null
+++ b/mcs/class/System.Drawing/run-tests.bat
@@ -0,0 +1,52 @@
+@echo off\r
+REM ********************************************************\r
+REM This batch call all the test batches with default parameters\r
+REM ********************************************************\r
+REM ********************************************************\r
+REM This batch file receives the follwing parameters:\r
+REM build/rebuild (optional): should the solution file be rebuilded \r
+REM                             or just builded before test run (default is rebuild)\r
+REM ********************************************************\r
+\r
+IF "%1"=="" (\r
+       set BUILD_OPTION=rebuild\r
+) ELSE (\r
+       set BUILD_OPTION=%1\r
+)\r
+       \r
+IF "%2"=="" (\r
+       set OUTPUT_FILE_PREFIX=System.Drawing.MonoTests.NUnitTestResult\r
+) ELSE (\r
+       set OUTPUT_FILE_PREFIX=%2\r
+)\r
+\r
+       \r
+IF "%3"=="" (\r
+       set RUNNING_FIXTURE=MonoTests\r
+) ELSE (\r
+       set RUNNING_FIXTURE=%3\r
+)\r
+\r
+call run-tests.test.bat %BUILD_OPTION% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE% "" ""\r
+\r
+IF "%1"=="" (\r
+       set BUILD_OPTION=rebuild\r
+) ELSE (\r
+       set BUILD_OPTION=%1\r
+)\r
+       \r
+IF "%2"=="" (\r
+       set OUTPUT_FILE_PREFIX=System.Drawing.Test.NUnitTestResult\r
+) ELSE (\r
+       set OUTPUT_FILE_PREFIX=%2\r
+)\r
+\r
+       \r
+IF "%3"=="" (\r
+       set RUNNING_FIXTURE=Test\r
+) ELSE (\r
+       set RUNNING_FIXTURE=%3\r
+)\r
+\r
+@echo on\r
+call run-tests.test.bat %BUILD_OPTION% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE% "Test\DrawingTest\Test" "..\..\..\"
\ No newline at end of file

diff --git a/mcs/class/System.Drawing/run-tests.test.bat b/mcs/class/System.Drawing/run-tests.test.bat
new file mode 100644 (file)
index 0000000..51c1133
--- /dev/null
+++ b/mcs/class/System.Drawing/run-tests.test.bat
@@ -0,0 +1,163 @@
+@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                             or just builded before test run (default is rebuild)\r
+REM output files name prefix (mandratory) : prefix for naming output xml files\r
+REM test fixture name (optional) : if you want to run some particular test fixture\r
+REM directory to run tests (optional)\r
+REM path back to root directory (opposite to previous param)\r
+REM example run-tests build GhTests Test.Sys.Drawing Test\DrawingTest\Test ..\..\..\\r
+REM will cause to build (and not rebuild) test solutions,\r
+REM running Test.Sys.Drawing fixture in directory Test\DrawingTest\Test\r
+REM with output files named GhTests.Net.xml and GhTests.GH.xml\r
+REM ********************************************************\r
+\r
+IF "%1"=="" GOTO USAGE\r
+\r
+IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+\r
+IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+\r
+REM ********************************************************\r
+REM Set parameters\r
+REM ********************************************************\r
+\r
+set BUILD_OPTION=%1\r
+set OUTPUT_FILE_PREFIX=%2\r
+set RUNNING_FIXTURE=%3\r
+set RUNNING_DIR=%~4\r
+set BACK_TO_ROOT_DIR=%~5\r
+\r
+\r
+REM ********************************************************\r
+REM @echo Set environment\r
+REM ********************************************************\r
+\r
+set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
+\r
+set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Drawing.jar;%JGAC_PATH%J2SE.Helpers.jar;%JGAC_PATH%jai_imageio.jar\r
+set NUNIT_OPTIONS=/exclude=NotWorking\r
+\r
+set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml\r
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml\r
+\r
+set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\\r
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar\r
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
+\r
+\r
+REM ********************************************************\r
+@echo Building .Net solution...\r
+REM ********************************************************\r
+\r
+devenv Test\DrawingTest\System.Drawing.Test.dotnet.sln /%BUILD_OPTION% Debug >%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+REM ********************************************************\r
+@echo Building GH solution...\r
+REM ********************************************************\r
+\r
+devenv Test\DrawingTest\System.Drawing.Test.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+REM ********************************************************\r
+@echo Building NUnit solution...\r
+REM ********************************************************\r
+\r
+devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+REM ********************************************************\r
+@echo Running Net reference tests...\r
+REM ********************************************************\r
+\r
+REM ********************************************************\r
+@echo Running fixture "%RUNNING_FIXTURE%"\r
+REM ********************************************************\r
+\r
+if "%RUNNING_DIR%" NEQ "" (\r
+       cd %RUNNING_DIR% )\r
+\r
+if not exist Exocortex.DSP.v1.dll (\r
+       copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\Exocortex.DSP.v1.dll .)\r
+\r
+if not exist DrawingTest.dll (\r
+       copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\DrawingTest.dll . )\r
+\r
+if not exist Test.dotnet.dll (\r
+       copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\Test.dotnet.dll . )\r
+\r
+copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.exe" .\r
+copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.dll" .\r
+copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.dll" .\r
+copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.dll" .\r
+nunit-console.exe /fixture:%RUNNING_FIXTURE% Test.dotnet.dll %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >%RUNNING_FIXTURE%_run.log.txt 2<&1\r
+\r
+\r
+REM ********************************************************\r
+@echo Running GH tests...\r
+REM ********************************************************\r
+\r
+REM ********************************************************\r
+@echo Running fixture "%RUNNING_FIXTURE%"\r
+REM ********************************************************\r
+\r
+copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\Exocortex.DSP.v1.jar .\r
+copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\DrawingTest.jar .\r
+copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\Test.jar .\r
+\r
+\r
+REM @echo on\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi Test.jar /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1\r
+REM @echo off\r
+\r
+if "%RUNNING_DIR%" NEQ "" (\r
+       copy %NET_OUTPUT_XML% %BACK_TO_ROOT_DIR%\r
+       copy %GH_OUTPUT_XML% %BACK_TO_ROOT_DIR%\r
+       cd %BACK_TO_ROOT_DIR% )\r
+\r
+REM ********************************************************\r
+@echo Build XmlTool\r
+REM ********************************************************\r
+set XML_TOOL_PATH=..\..\tools\xmltool\r
+devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+copy %XML_TOOL_PATH%\bin\Debug_Java\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
+xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%\r
+@echo off\r
+\r
+:FINALLY\r
+GOTO END\r
+\r
+:ENVIRONMENT_EXCEPTION\r
+@echo This test requires environment variables JAVA_HOME and GH_HOME to be defined\r
+GOTO END\r
+\r
+:BUILD_EXCEPTION\r
+@echo Error in building solutions. See %RUNNING_FIXTURE%_build.log.txt for details...\r
+REM EXIT 1\r
+GOTO END\r
+\r
+:RUN_EXCEPTION\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUNNING_FIXTURE%_run.log.txt 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
+REM EXIT 0\r

diff --git a/mcs/class/System.Drawing/runmonotestfixture.bat b/mcs/class/System.Drawing/runmonotestfixture.bat
new file mode 100644 (file)
index 0000000..0f201c8
--- /dev/null
+++ b/mcs/class/System.Drawing/runmonotestfixture.bat
@@ -0,0 +1 @@
+run-tests.test.bat build %1 %1 "" ""
\ No newline at end of file

diff --git a/mcs/class/System.Drawing/runtestfixture.bat b/mcs/class/System.Drawing/runtestfixture.bat
new file mode 100644 (file)
index 0000000..306dab9
--- /dev/null
+++ b/mcs/class/System.Drawing/runtestfixture.bat
@@ -0,0 +1 @@
+run-tests.test.bat build %1 %1 Test\DrawingTest\Test ..\..\..\
\ No newline at end of file