SqlClient mono friendly bits

[mono.git] / mcs / class / System.Web.Extensions / run-tests-nunit.bat

diff --git a/mcs/class/System.Web.Extensions/run-tests-nunit.bat b/mcs/class/System.Web.Extensions/run-tests-nunit.bat
index 5bc65ec2595cddb221f13e5c5e3ef5d35c2bb564..2a0a08615939e5d4f0c4a3612b02ba75ceb90814 100644 (file)
--- a/mcs/class/System.Web.Extensions/run-tests-nunit.bat
+++ b/mcs/class/System.Web.Extensions/run-tests-nunit.bat
@@ -1,4 +1,5 @@
 @echo off\r
+setlocal\r
 @REM ********************************************************\r
 @REM This batch file receives the follwing parameters:\r
 @REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -28,7 +29,7 @@ IF "%1"=="" (
 @REM Set parameters\r
 @REM ********************************************************\r
 \r
-set OUTPUT_FILE_PREFIX=System.Web.Extensions\r
+set OUTPUT_FILE_PREFIX=System_Web_Extensions\r
 set TEST_SOLUTION=Test\System.Web.Extensions.Test.sln\r
 set TEST_ASSEMBLY=System.Web.Extensions.Test.jar\r
 set PROJECT_CONFIGURATION=Debug_Java\r
@@ -53,7 +54,8 @@ set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%
 @REM ********************************************************\r
 \r
 set JGAC_PATH=%VMW_HOME%\java_refs\framework\\r
-set JAVA_HOME=%VMW_HOME%\jre\r
+if not defined JAVA_HOME set JAVA_HOME=%VMW_HOME%\jre\r
+echo using JAVA_HOME=%JAVA_HOME%\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
@@ -193,3 +195,4 @@ copy %BUILD_LOG% ..\
 copy %GH_OUTPUT_XML% ..\\r
 \r
 @REM EXIT 0\r
+endlocal
\ No newline at end of file