[sgen] Reenable gc-altstack test

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

diff --git a/mcs/class/System.DirectoryServices/run-tests.test.bat b/mcs/class/System.DirectoryServices/run-tests.test.bat
index aa1febc7f10cba570fbee06a0d4a14fad80bceff..75aff8320ce928986b50392704863a5f2df6a5c4 100644 (file)
--- a/mcs/class/System.DirectoryServices/run-tests.test.bat
+++ b/mcs/class/System.DirectoryServices/run-tests.test.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
@@ -138,11 +138,22 @@ REM ********************************************************
 @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% Debug_Java >>%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