Merge pull request #2707 from lambdageek/dev/monoerror-mono_image_load_module_dynamic

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

diff --git a/mcs/class/corlib/run-tests.test.bat b/mcs/class/corlib/run-tests.test.bat
index dcf0eefc837e5c5d19ba6e7880cb7dfd97086a4d..f78342d8125c121d508909f4efec56b9212205b6 100644 (file)
--- a/mcs/class/corlib/run-tests.test.bat
+++ b/mcs/class/corlib/run-tests.test.bat
@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System_MonoTests
+set OUTPUT_FILE_PREFIX=Corlib_MonoTests
 set RUNNING_FIXTURE=MonoTests.System
 set TEST_SOLUTION=Test\Mscorlib.Test20.sln
 set TEST_ASSEMBLY=Mscorlib.Test20.jar
@@ -53,14 +53,14 @@ REM @echo Set environment
 REM ********************************************************
 
 set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
-set JAVA_HOME=%VMW_HOME%\jre5
+set JAVA_HOME=%VMW_HOME%\jre6
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Configuration.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
-set NUNIT_OPTIONS=/exclude=NotWorking
+set NUNIT_OPTIONS=/exclude=NotWorking,NotDotNet,TargetJvmNotSupported,TargetJvmNotWorking
 
 if "%GH_VERSION%"=="" (
        set GH_VERSION=0_0_0_0
@@ -120,7 +120,8 @@ REM ********************************************************
 copy %BACK_TO_ROOT_DIR%Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
 
 REM @echo on
-"%JAVA_HOME%\bin\java" -Xmx1024M -Djava.io.tmpdir="C:\Temp" -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
+"%JAVA_HOME%\bin\java" -server -Xmx1024M -Djava.io.tmpdir="C:\Temp" -classpath %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
+REM jdb -server -Xmx1024M -Djava.io.tmpdir="C:\Temp" -classpath %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%
 REM @echo off
 
 REM ********************************************************
@@ -131,7 +132,7 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool
 if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
 
 REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
 
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION