added NET_2_0 strongly typed overrides

[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 5bd37152d1551ab16ad5f7305120ac93310d63b2..5cc433b4f693286b1b9b281240ed937cd7f4902f 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.disconnected.bat
+++ b/mcs/class/System.Data/run-tests.test.disconnected.bat
@@ -17,7 +17,7 @@ IF "%1"=="" GOTO USAGE
 \r
 IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 \r
 IF "%1"=="" (\r
@@ -33,9 +33,9 @@ REM ********************************************************
 set BUILD_OPTION=%1\r
 set OUTPUT_FILE_PREFIX=MonoTests.System.Data\r
 set RUNNING_FIXTURE=MonoTests.System.Data\r
-set TEST_SOLUTION=Test\System.Data.Test.sln\r
+set TEST_SOLUTION=Test\System.Data.Test20.sln\r
 set TEST_ASSEMBLY=System.Data.Test.jar\r
-set PROJECT_CONFIGURATION=Debug_Java\r
+set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
 set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.disconnected\r
 \r
@@ -43,7 +43,7 @@ REM ********************************************************
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Data.jar;%JGAC_PATH%J2SE.Helpers.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
@@ -51,7 +51,7 @@ set NUNIT_OPTIONS=/exclude=NotWorking
 set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
-set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar\r
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar\r
 \r
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
 \r
@@ -59,7 +59,8 @@ REM ********************************************************
 @echo Building GH solution...\r
 REM ********************************************************\r
 \r
-devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+rem devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -69,7 +70,8 @@ REM ********************************************************
 \r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
 \r
-devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
 \r
 goto NUNITREADY\r
 \r
@@ -99,7 +101,8 @@ REM ********************************************************
 @echo Build XmlTool\r
 REM ********************************************************\r
 set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1\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% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -117,7 +120,7 @@ xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
 GOTO END\r
 \r
 :ENVIRONMENT_EXCEPTION\r
-@echo This test requires environment variables JAVA_HOME and GH_HOME to be defined\r
+@echo This test requires environment variables JAVA_HOME and GHROOT to be defined\r
 GOTO END\r
 \r
 :BUILD_EXCEPTION\r