2008-11-01 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / System.Drawing / run-tests.test.bat

diff --git a/mcs/class/System.Drawing/run-tests.test.bat b/mcs/class/System.Drawing/run-tests.test.bat
index e9b9a33983fb7c217750d3b9386fb01225723c65..ee3fc84c267e31a73f154915c473134d79618e09 100644 (file)
--- a/mcs/class/System.Drawing/run-tests.test.bat
+++ b/mcs/class/System.Drawing/run-tests.test.bat
@@ -41,7 +41,6 @@ set TEST_J2EE_ASSEMBLY=System.Drawing.Test20.J2EE.jar
 set TEST_NET_ASSEMBLY=System.Drawing.Test.dll\r
 set PROJECT_J2EE_CONFIGURATION=Debug_Java20\r
 set PROJECT_NET_CONFIGURATION=Debug\r
-set NUNIT_CONSOLE_PATH="C:\Program Files\NUnit-Net-2.0 2.2.8\bin"\r
 \r
 set startDate=%date%\r
 set startTime=%time%\r
@@ -58,8 +57,8 @@ REM ********************************************************
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
-set JAVA_HOME=%VMW_HOME%\jre5\r
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\\r
+set JAVA_HOME=%VMW_HOME%\jre\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
@@ -85,7 +84,7 @@ set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2E
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.core.jar\r
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit-console.jar\r
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.\r
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_J2EE_ASSEMBLY%\r
 \r
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
 \r
@@ -131,7 +130,7 @@ REM ********************************************************
 REM ********************************************************\r
 \r
 REM ********************************************************\r
-@echo Running fixture "%RUNNING_FIXTURE%"\r
+@echo Running fixture "%RUNNING_FIXTURE%" (in .NET)\r
 REM ********************************************************\r
 \r
 if "%RUNNING_DIR%" NEQ "" (\r
@@ -150,8 +149,9 @@ copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit-console.e
 copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.util.dll" .\r
 copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.core.dll" .\r
 copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.dll" .\r
-%NUNIT_CONSOLE_PATH%\nunit-console.exe /fixture:%RUNNING_FIXTURE% %TEST_NET_ASSEMBLY% %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
-\r
+echo "==== .NET reference ==="  >> %RUN_LOG%\r
+nunit-console.exe /fixture:%RUNNING_FIXTURE% %TEST_NET_ASSEMBLY% %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
+echo "==== End .NET reference ==="  >> %RUN_LOG%\r
 \r
 REM ********************************************************\r
 @echo Running GH tests...\r
@@ -184,7 +184,7 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool
 if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP\r
 \r
 REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r