Author: borisk
Date: 2006-09-12 04:56:26 -0400 (Tue, 12 Sep 2006)
New Revision: 65276
Modified:
trunk/mcs/class/System.Drawing/ChangeLog
trunk/mcs/class/System.Drawing/System.Drawing20.vmwcsproj
trunk/mcs/class/System.Drawing/Test/ChangeLog
trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj
trunk/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj
trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
trunk/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj
trunk/mcs/class/System.Drawing/Test/Test20.csproj
trunk/mcs/class/System.Drawing/run-tests.bat
trunk/mcs/class/System.Drawing/run-tests.test.bat
Log:
Fixes for TARGET_JVM tests.
Modified: trunk/mcs/class/System.Drawing/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/ChangeLog 2006-09-12 08:19:52 UTC (rev
65275)
+++ trunk/mcs/class/System.Drawing/ChangeLog 2006-09-12 08:56:26 UTC (rev
65276)
@@ -1,3 +1,7 @@
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+ * run-tests.bat, run-tests.test.bat: reworked tests logging.
+ * System.Drawing20.vmwcsproj: updated references path.
+
2006-09-01 Sebastien Pouliot <[EMAIL PROTECTED]>
* Makefile: Add new almogaver32bits.tif file to EXTRA_DISTFILES
Modified: trunk/mcs/class/System.Drawing/System.Drawing20.vmwcsproj
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing20.vmwcsproj 2006-09-12
08:19:52 UTC (rev 65275)
+++ trunk/mcs/class/System.Drawing/System.Drawing20.vmwcsproj 2006-09-12
08:56:26 UTC (rev 65276)
@@ -289,7 +289,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE 2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\lib\rt.jar"
REFS-JarPath-j2se-helpers="..\lib\J2SE.Helpers.jar"/>
+ <UserProperties
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\lib\rt.jar"
REFS-JarPath-j2se-helpers="..\lib\J2SE.Helpers.jar"/>
</VisualStudio>
</ProjectExtensions>
</Project>
Modified: trunk/mcs/class/System.Drawing/Test/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/Test/ChangeLog 2006-09-12 08:19:52 UTC
(rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/ChangeLog 2006-09-12 08:56:26 UTC
(rev 65276)
@@ -1,3 +1,6 @@
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+ * Test20.csproj,Test20.J2EE.vmwcsproj: updated references path.
+
2006-08-28 Boris Kirzner <[EMAIL PROTECTED]>
* System.Drawing.Test20.J2EE.sln, System.Drawing.Test20.sln,
Test20.csproj, Test20.J2EE.vmwcsproj: added solution
Modified:
trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
2006-09-12 08:19:52 UTC (rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog
2006-09-12 08:56:26 UTC (rev 65276)
@@ -1,3 +1,6 @@
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+ * DrawingTestHelper20.J2EE.vmwcsproj: updated references path.
+
2006-08-28 Boris Kirzner <[EMAIL PROTECTED]>
* DrawingTestHelper20.csproj, DrawingTestHelper20.J2EE.vmwcsproj :
added project files for NET_2_0 tests.
Modified:
trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj
===================================================================
---
trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj
2006-09-12 08:19:52 UTC (rev 65275)
+++
trunk/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj
2006-09-12 08:56:26 UTC (rev 65276)
@@ -87,7 +87,7 @@
<ItemGroup>
<Reference Include="J2SE.Helpers, Version=0.0.0.0,
Culture=neutral">
<Private>False</Private>
- <HintPath>..\..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\J2SE.Helpers.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\J2SE.Helpers.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=0.0.0.0,
Culture=neutral">
<SpecificVersion>False</SpecificVersion>
@@ -96,7 +96,7 @@
</Reference>
<Reference Include="rt, Version=0.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\jre5\rt.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\jre5\rt.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System"/>
@@ -125,7 +125,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE
2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"
REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac
\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE 2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-nunit-util="..\..\..\..\..\nunit20\util\bin\Debug_Java20\nunit.util.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\util\bin\Debug_Java20\nunit.core.jar"/>
+ <UserProperties
REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE
V2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"
REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2E
E V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-nunit-util="..\..\..\..\..\nunit20\util\bin\Debug_Java20\nunit.util.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\util\bin\Debug_Java20\nunit.core.jar"/>
</VisualStudio>
</ProjectExtensions>
</Project>
Modified:
trunk/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj
===================================================================
---
trunk/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj
2006-09-12 08:19:52 UTC (rev 65275)
+++
trunk/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj
2006-09-12 08:56:26 UTC (rev 65276)
@@ -116,7 +116,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE 2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE
2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..
\..\Program Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"/>
+ <UserProperties
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE
V2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\
..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"/>
</VisualStudio>
</ProjectExtensions>
</Project>
Modified: trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
2006-09-12 08:19:52 UTC (rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
2006-09-12 08:56:26 UTC (rev 65276)
@@ -1,3 +1,8 @@
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+
+ * TestBmpCodec.cs, TestJpegCodec.cs: ifdef unsafe code
+ for TARGET_JVM.
+
2006-09-01 Sebastien Pouliot <[EMAIL PROTECTED]>
* GifCodecTest.cs: New. Unit tests for GIF codec.
Modified:
trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
===================================================================
--- trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
2006-09-12 08:19:52 UTC (rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
2006-09-12 08:56:26 UTC (rev 65276)
@@ -302,6 +302,7 @@
}
}
+#if !TARGET_JVM
[Test]
[Category ("NotWorking")]
public void Bitmap24bitData ()
@@ -426,6 +427,7 @@
}
}
}
+#endif
/* Checks bitmap features on a know 32-bits bitmap (codec)*/
[Test]
Modified:
trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
===================================================================
--- trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
2006-09-12 08:19:52 UTC (rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
2006-09-12 08:56:26 UTC (rev 65276)
@@ -126,6 +126,7 @@
}
}
+#if !TARGET_JVM
[Test]
[Category ("NotWorking")]
public void Bitmap24bitData ()
@@ -250,6 +251,7 @@
}
}
}
+#endif
[Test]
public void Save ()
Modified: trunk/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj
===================================================================
--- trunk/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj 2006-09-12
08:19:52 UTC (rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj 2006-09-12
08:56:26 UTC (rev 65276)
@@ -165,7 +165,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-nunit-framework="..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE 2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\..
\Program Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"
/>
+ <UserProperties
REFS-JarPath-nunit-framework="..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jre5\lib\rt.jar" REFS-JarPath-j2se-helpers="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-system-drawing="..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\.
.\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" />
</VisualStudio>
</ProjectExtensions>
</Project>
\ No newline at end of file
Modified: trunk/mcs/class/System.Drawing/Test/Test20.csproj
===================================================================
--- trunk/mcs/class/System.Drawing/Test/Test20.csproj 2006-09-12 08:19:52 UTC
(rev 65275)
+++ trunk/mcs/class/System.Drawing/Test/Test20.csproj 2006-09-12 08:56:26 UTC
(rev 65276)
@@ -17,7 +17,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>DrawingTest\Test\</OutputPath>
- <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NET_2_0;TARGET_JVM</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Modified: trunk/mcs/class/System.Drawing/run-tests.bat
===================================================================
--- trunk/mcs/class/System.Drawing/run-tests.bat 2006-09-12 08:19:52 UTC
(rev 65275)
+++ trunk/mcs/class/System.Drawing/run-tests.bat 2006-09-12 08:56:26 UTC
(rev 65276)
@@ -15,7 +15,7 @@
)
IF "%2"=="" (
- set OUTPUT_FILE_PREFIX=System.Drawing.MonoTests.NUnitTestResult
+ set OUTPUT_FILE_PREFIX=System.Drawing
) ELSE (
set OUTPUT_FILE_PREFIX=%2
)
@@ -36,7 +36,7 @@
)
IF "%2"=="" (
- set OUTPUT_FILE_PREFIX=System.Drawing.Test.NUnitTestResult
+ set OUTPUT_FILE_PREFIX=System.Drawing
) ELSE (
set OUTPUT_FILE_PREFIX=%2
)
Modified: trunk/mcs/class/System.Drawing/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.Drawing/run-tests.test.bat 2006-09-12 08:19:52 UTC
(rev 65275)
+++ trunk/mcs/class/System.Drawing/run-tests.test.bat 2006-09-12 08:56:26 UTC
(rev 65276)
@@ -36,6 +36,9 @@
set NUNIT_CONSOLE_PATH="C:\Program Files\NUnit-Net-2.0 2.2.8\bin"
set JAVA_HOME=%VMW_HOME%\jre5
+set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%
+set TIMEL=%time:~0,2%_%time:~3,2%
+set TIMESTAMP=%DATEL%_%TIMEL%
REM ********************************************************
REM @echo Set environment
@@ -46,9 +49,12 @@
set
RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Drawing.jar;%JGAC_PATH%J2SE.Helpers.jar;%JGAC_PATH%jai_imageio.jar
set NUNIT_OPTIONS=/exclude=NotWorking
-set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml
+set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.Net.%TIMESTAMP%.xml
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml
+set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt
+set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt
+
set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\
set
NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit-console.jar
set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
@@ -59,7 +65,7 @@
REM ********************************************************
REM devenv Test\DrawingTest\System.Drawing.Test.dotnet.sln /%BUILD_OPTION%
Debug >%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %TEST_NET_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_NET_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt
2<&1
+msbuild %TEST_NET_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_NET_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -72,7 +78,7 @@
REM ********************************************************
REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt
2<&1
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -91,7 +97,7 @@
REM ********************************************************
REM devenv Test\DrawingTest\System.Drawing.Test.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %TEST_J2EE_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt
2<&1
+msbuild %TEST_J2EE_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -119,7 +125,7 @@
copy
"%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.util.dll" .
copy
"%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.core.dll" .
copy
"%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.dll"
.
-%NUNIT_CONSOLE_PATH%\nunit-console.exe /fixture:%RUNNING_FIXTURE%
%TEST_NET_ASSEMBLY% %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML%
>%RUNNING_FIXTURE%_run.log.txt 2<&1
+%NUNIT_CONSOLE_PATH%\nunit-console.exe /fixture:%RUNNING_FIXTURE%
%TEST_NET_ASSEMBLY% %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >>%RUN_LOG% 2<&1
REM ********************************************************
@@ -136,7 +142,7 @@
REM @echo on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi
%TEST_J2EE_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS%
/xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi
%TEST_J2EE_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS%
/xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
REM @echo off
if "%RUNNING_DIR%" NEQ "" (
@@ -149,7 +155,7 @@
REM ********************************************************
set XML_TOOL_PATH=..\..\tools\mono-xmltool
REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt
2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_J2EE_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -164,6 +170,12 @@
@echo off
:FINALLY
+
+copy %RUNNING_DIR%\%RUN_LOG% ..\%BACK_TO_ROOT_DIR%
+copy %BUILD_LOG% ..\%BACK_TO_ROOT_DIR%
+copy %NET_OUTPUT_XML% ..\%BACK_TO_ROOT_DIR%
+copy %GH_OUTPUT_XML% ..\%BACK_TO_ROOT_DIR%
+
GOTO END
:ENVIRONMENT_EXCEPTION
@@ -171,12 +183,12 @@
GOTO END
:BUILD_EXCEPTION
[EMAIL PROTECTED] Error in building solutions. See
%RUNNING_FIXTURE%_build.log.txt for details...
[EMAIL PROTECTED] Error in building solutions. See
System.Drawing.%RUNNING_FIXTURE%_build.log.txt for details...
REM EXIT 1
GOTO END
:RUN_EXCEPTION
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See
%RUNNING_FIXTURE%_run.log.txt for details...
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See
System.Drawing.%RUNNING_FIXTURE%_run.log.txt for details...
REM EXIT 1
GOTO END
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches