projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Mark tests as not working under TARGET_JVM
[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 2ebc9d9a56e4e5bbec8702d8197d1c8ca3c9ace7..1db78146f9cea5c91f39ab811501c1b2414caade 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.connected.bat
+++ b/mcs/class/System.Data/run-tests.test.connected.bat
@@ -15,9 +15,8 @@ REM ********************************************************
 \r
 IF "%1"=="" GOTO USAGE\r
 \r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 \r
 IF "%1"=="" (\r
@@ -31,22 +30,32 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=MonoTests.System.Data\r
+set OUTPUT_FILE_PREFIX=System_Data_connected\r
 set RUNNING_FIXTURE=MonoTests.System.Data\r
-\r
-set TEST_SOLUTION=Test\ProviderTests\System.Data.OleDb.J2EE.sln\r
-set TEST_ASSEMBLY=System.Data.OleDb.Tests.jar\r
-set PROJECT_CONFIGURATION=Debug_Java\r
+set TEST_SOLUTION=Test\ProviderTests\System.Data.OleDb.Tests20.J2EE.sln\r
+set TEST_ASSEMBLY=System.Data.OleDb.Tests.J2EE.jar\r
+set PROJECT_CONFIGURATION=Debug_Java20\r
 set APP_CONFIG_FILE=Test\ProviderTests\System.Data.OleDb.J2EE.config\r
 \r
-set RUN_ID=connected\r
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.%RUN_ID%\r
+\r
+set startDate=%date%\r
+set startTime=%time%\r
+set sdy=%startDate:~10%\r
+set /a sdm=1%startDate:~4,2% - 100\r
+set /a sdd=1%startDate:~7,2% - 100\r
+set /a sth=%startTime:~0,2%\r
+set /a stm=1%startTime:~3,2% - 100\r
+set /a sts=1%startTime:~6,2% - 100\r
+set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%\r
+\r
+\r
 \r
 REM ********************************************************\r
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JAVA_HOME=%VMW_HOME%\jre6\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
@@ -54,29 +63,37 @@ 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
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\msbase.jar\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\mssqlserver.jar\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\msutil.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\msbase.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\mssqlserver.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\msutil.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\postgresql-8.0.309.jdbc3.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\sqljdbc.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\ojdbc14.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\postgresql-8.0.309.jdbc3.jar\r
 \r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\db2jcc.jar\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\db2jcc_license_cu.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\ojdbc14.jar\r
+\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\db2jcc.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\db2jcc_license_cu.jar\r
 \r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml\r
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
-set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar\r
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar\r
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar\r
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar\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_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar\r
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.\r
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;System.Data.OleDb.Tests.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%\r
 \r
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
 \r
@@ -84,7 +101,8 @@ REM ********************************************************
 @echo Building GH solution...\r
 REM ********************************************************\r
 \r
-devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+rem devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -94,7 +112,8 @@ REM ********************************************************
 \r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
 \r
-devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+rem devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 goto NUNITREADY\r
 \r
@@ -117,19 +136,30 @@ REM ********************************************************
 copy Test\ProviderTests\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
 copy %APP_CONFIG_FILE% nunit-console.exe.config\r
 \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% >>%RUNNING_FIXTURE%_run.%RUN_ID%.log.txt 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
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\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
@@ -144,16 +174,16 @@ 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 variable VMW_HOME to be defined\r
 GOTO END\r
 \r
 :BUILD_EXCEPTION\r
-@echo Error in building solutions. See %RUNNING_FIXTURE%_build.log.txt for details...\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
 REM EXIT 1\r
 GOTO END\r
 \r
 :RUN_EXCEPTION\r
-@echo Error in running fixture %RUNNING_FIXTURE%. See %RUNNING_FIXTURE%_run.%RUN_ID%.log.txt for details...\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...\r
 REM EXIT 1\r
 GOTO END\r
 \r
@@ -162,4 +192,8 @@ GOTO END
 GOTO END\r
 \r
 :END\r
+copy %RUN_LOG% ..\\r
+copy %BUILD_LOG% ..\\r
+copy %GH_OUTPUT_XML% ..\\r
+\r
 REM EXIT 0\r
my mono mirror. check out Moved to http://github.com/mono/mono