Merge pull request #2333 from joelmartinez/docs-classic-fix

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

diff --git a/mcs/class/System.Data/run-tests.test.disconnected.bat b/mcs/class/System.Data/run-tests.test.disconnected.bat
index 3bd256e6ffc5c57e62452d1857467d2bde0a1025..2ab22fdefda302498e8a5a139c39762efd6f1e18 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.disconnected.bat
+++ b/mcs/class/System.Data/run-tests.test.disconnected.bat
@@ -55,8 +55,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
@@ -120,22 +120,33 @@ 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
 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
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
 REM @echo off\r
 \r
 REM ********************************************************\r
 @echo Build XmlTool\r
 REM ********************************************************\r
 set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
+\r
+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
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
+goto XMLTOOLREADY\r
+\r
+:XMLTOOLSKIP\r
+echo Skipping XmlToll build...\r
+\r
+:XMLTOOLREADY\r
+set XMLTOOL_BUILD=DONE\r
+\r
 copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt .\r
 \r