Fix test project configurations. Use explicit java io temp path.

svn path=/trunk/mcs/; revision=71810

diff --git a/mcs/class/corlib/Test/Mscorlib.Test20.sln b/mcs/class/corlib/Test/Mscorlib.Test20.sln
index 4166ec0f4776f20a13cf8eff09a523f452f6e55f..14f04b42df3938cf44fd472e8fdb7013816f5074 100644 (file)
--- a/mcs/class/corlib/Test/Mscorlib.Test20.sln
+++ b/mcs/class/corlib/Test/Mscorlib.Test20.sln
@@ -5,14 +5,14 @@ Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Mscorlib.Test20", "Mscorlib
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug_Java|Any CPU = Debug_Java|Any CPU\r
-               Release_Java|Any CPU = Release_Java|Any CPU\r
+               Debug_Java20|Any CPU = Debug_Java20|Any CPU\r
+               Release_Java20|Any CPU = Release_Java20|Any CPU\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
-               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
-               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
-               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Release_Java20|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {FCE3E281-0E07-43EE-8611-18C14A180B85}.Release_Java20|Any CPU.Build.0 = Release_Java|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/mcs/class/corlib/Test/Mscorlib.Test20.vmwcsproj b/mcs/class/corlib/Test/Mscorlib.Test20.vmwcsproj
index 9391d59e779a5fe2afb8005cb0062718a00c77dd..628fdbad1675d33368a46e263d6bd9f8b65351eb 100644 (file)
--- a/mcs/class/corlib/Test/Mscorlib.Test20.vmwcsproj
+++ b/mcs/class/corlib/Test/Mscorlib.Test20.vmwcsproj
@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java20</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>8.0.50727</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
@@ -15,11 +15,11 @@
     <RootNamespace>Mscorlib.Test20</RootNamespace>\r
     <jarserver>ipa</jarserver>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug_Java\</OutputPath>\r
+    <OutputPath>bin\Debug_Java20\</OutputPath>\r
     <DefineConstants>TRACE;DEBUG;JAVA;NET_2_0;NET_1_1;TARGET_JVM</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
@@ -30,10 +30,10 @@
     <AdditionalClassPath>\r
     </AdditionalClassPath>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
     <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release_Java\</OutputPath>\r
+    <OutputPath>bin\Release_Java20\</OutputPath>\r
     <DefineConstants>TRACE;JAVA</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r

diff --git a/mcs/class/corlib/run-tests.test.bat b/mcs/class/corlib/run-tests.test.bat
index e8f1966e73101303894ed89a66212694aebf4e9b..dcf0eefc837e5c5d19ba6e7880cb7dfd97086a4d 100644 (file)
--- a/mcs/class/corlib/run-tests.test.bat
+++ b/mcs/class/corlib/run-tests.test.bat
@@ -34,7 +34,7 @@ set OUTPUT_FILE_PREFIX=System_MonoTests
 set RUNNING_FIXTURE=MonoTests.System
 set TEST_SOLUTION=Test\Mscorlib.Test20.sln
 set TEST_ASSEMBLY=Mscorlib.Test20.jar
-set PROJECT_CONFIGURATION=Debug_Java
+set PROJECT_CONFIGURATION=Debug_Java20
 
 
 set startDate=%date%
@@ -120,7 +120,7 @@ REM ********************************************************
 copy %BACK_TO_ROOT_DIR%Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
 
 REM @echo on
-"%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
+"%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
 REM @echo off
 
 REM ********************************************************