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

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

diff --git a/mcs/class/System.Data/run-tests.test.connected.bat b/mcs/class/System.Data/run-tests.test.connected.bat
index 1cdb66882942543679ea66a0033d66dd611a406c..ad5f2deaff6265028b18a0238f8fc9fbfd38e115 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.connected.bat
+++ b/mcs/class/System.Data/run-tests.test.connected.bat
@@ -49,12 +49,13 @@ set /a sts=1%startTime:~6,2% - 100
 set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%\r
 \r
 \r
+\r
 REM ********************************************************\r
 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
@@ -62,18 +63,18 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
 \r
-rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\msbase.jar\r
-rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\mssqlserver.jar\r
-rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\msutil.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\msbase.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\mssqlserver.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\msutil.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\sqljdbc.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\sqljdbc.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\postgresql-8.0.309.jdbc3.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\postgresql-8.0.309.jdbc3.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\ojdbc14.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\ojdbc14.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\db2jcc.jar\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\db2jcc_license_cu.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\db2jcc.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\db2jcc_license_cu.jar\r
 \r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
@@ -136,18 +137,29 @@ copy Test\ProviderTests\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
 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.%RUN_ID%.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