Fixes for TARGET_JVM tests.

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

diff --git a/mcs/class/System.Data.OracleClient/run-tests.test.bat b/mcs/class/System.Data.OracleClient/run-tests.test.bat
index 6059a983c9a03a543f5ebefe6528daa72bda81ac..78f673a0634368563e608c02826f02d7b7376289 100644 (file)
--- a/mcs/class/System.Data.OracleClient/run-tests.test.bat
+++ b/mcs/class/System.Data.OracleClient/run-tests.test.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 "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 \r
 IF "%1"=="" (\r
@@ -31,7 +30,7 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=MonoTests.System.Data.OracleClient\r
+set OUTPUT_FILE_PREFIX=System.Data.OracleClient\r
 set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient\r
 \r
 set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln\r
@@ -45,7 +44,8 @@ REM ********************************************************
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JAVA_HOME=%VMW_HOME%\jre5\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
@@ -58,8 +58,9 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\ojdbc14.jar
 \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
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml\r
+set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt\r
+set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r
@@ -76,7 +77,7 @@ REM ********************************************************
 REM ********************************************************\r
 \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
+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
@@ -85,7 +86,7 @@ REM ********************************************************
 REM ********************************************************\r
 \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
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -102,7 +103,7 @@ 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% >>%RUNNING_FIXTURE%_run.log.txt 2<&1\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
 REM @echo off\r
 \r
 REM ********************************************************\r
@@ -110,7 +111,7 @@ REM ********************************************************
 REM ********************************************************\r
 set XML_TOOL_PATH=..\..\tools\mono-xmltool\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% >>%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
@@ -125,19 +126,24 @@ xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
 @echo off\r
 \r
 :FINALLY\r
+\r
+copy %RUN_LOG% ..\\r
+copy %BUILD_LOG% ..\\r
+copy %GH_OUTPUT_XML% ..\\r
+\r
 GOTO END\r
 \r
 :ENVIRONMENT_EXCEPTION\r
-@echo This test requires environment variables JAVA_HOME and GHROOT 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.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