* BuildEngine.cs (BuildProjectFile): Use AddProperty method to specify

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

diff --git a/mcs/class/System/run-tests.bat b/mcs/class/System/run-tests.bat
index 907604212791bcea262da6f54f8ee05c7c5122f0..1aedacecfc7c36d2250015cb1e299ae88d73d174 100644 (file)
--- a/mcs/class/System/run-tests.bat
+++ b/mcs/class/System/run-tests.bat
@@ -53,8 +53,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
@@ -74,9 +74,9 @@ set BUILD_LOG=%COMMON_PREFIX%.build.log
 set RUN_LOG=%COMMON_PREFIX%.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_PATH%framework\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%util\bin\%PROJECT_CONFIGURATION%\nunit.util.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%core\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
@@ -119,12 +119,13 @@ REM ********************************************************
 @echo Running fixture "%RUNNING_FIXTURE%"\r
 REM ********************************************************\r
 \r
-copy %BACK_TO_ROOT_DIR%Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
+copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
 copy %APP_CONFIG_FILE% nunit-console.exe.config\r
 \r
 set TMPDIR=%TMP%\r
 \r
 REM @echo on\r
+echo "%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%\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
@@ -136,7 +137,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% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r