From 0f0b264f412e5c3bbd4f3ee29565601506bea592 Mon Sep 17 00:00:00 2001 From: Boris Kirzner Date: Mon, 28 Aug 2006 12:20:11 +0000 Subject: [PATCH] Enable NET_2_0 tests run for TARGET_JVM. svn path=/trunk/mcs/; revision=64471 --- mcs/class/System.Drawing/ChangeLog | 742 +++++++++--------- mcs/class/System.Drawing/Test/ChangeLog | 5 + .../DrawingTest/DrawingTestHelper/ChangeLog | 4 + .../DrawingTestHelper20.J2EE.vmwcsproj | 131 ++++ .../DrawingTestHelper20.csproj | 61 ++ .../src/Exocortex.DSP20.v1.J2EE.vmwcsproj | 122 +++ .../src/Exocortex.DSP20.v1.csproj | 55 ++ .../Test/System.Drawing.Test20.J2EE.sln | 46 ++ .../Test/System.Drawing.Test20.sln | 32 + .../System.Drawing/Test/Test20.J2EE.vmwcsproj | 171 ++++ mcs/class/System.Drawing/Test/Test20.csproj | 117 +++ mcs/class/System.Drawing/run-tests.test.bat | 73 +- 12 files changed, 1161 insertions(+), 398 deletions(-) create mode 100644 mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj create mode 100644 mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj create mode 100644 mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj create mode 100644 mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj create mode 100644 mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln create mode 100644 mcs/class/System.Drawing/Test/System.Drawing.Test20.sln create mode 100644 mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj create mode 100644 mcs/class/System.Drawing/Test/Test20.csproj diff --git a/mcs/class/System.Drawing/ChangeLog b/mcs/class/System.Drawing/ChangeLog index db1c0571f2d..db59a98bb21 100644 --- a/mcs/class/System.Drawing/ChangeLog +++ b/mcs/class/System.Drawing/ChangeLog @@ -1,373 +1,377 @@ -2006-08-24 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for TextureBrush. - -2006-08-12 Duncan Mak - - * GDIPlusTest.csproj: New MSBuild project file for building - GDIPlusTest on Windows. - - * System.Drawing_test.dll.sources: Add gdipEnums.cs, - gdipFunctions.cs and gdipStructs.cs. - - * Makefile (TEST_MCS_FLAGS): Add new #define 'TEST'. This is used - to exclude parts of gdipFunctions so that it could be reused as - part of the NUnit tests. - -2006-08-02 Sebastien Pouliot - - * Makefile: Add the test bitmaps to EXTRA_DISTFILES so monobuild has - them available when running the unit tests. - -2006-07-06 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for direct GDI+ - function calls. - -2006-06-30 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for SolidBrush. - -2006-05-30 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for FontFamily. - -2006-05-17 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for Pen. - -2006-05-16 Vladimir Krasnov - - * run-tests.test.bat: skip nunit build if already done - -2006-05-09 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for - PathGradientBrush. - -2006-01-30 Boris Kirzner - * run-tests.test.bat: changed location of xmltool. - -2006-01-29 Boris Kirzner - * run-tests.bat, run-tests.test.bat, runtestfixture.bat, - runmonotestfixture.bat : added batch files for automatic - testing for TARGET_JVM. - -2006-01-18 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for RegionData and - non-rectangular Region. - -2006-01-12 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for GraphicsPath - and PathData. - -2006-01-11 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added CAS unit tests for Region to - the build. - -2005-12-05 Jordi Mas i Hernandez - +2006-08-28 Boris Kirzner + + * run-tests.test.bat: chnged script for tests NET_2_0 run. + +2006-08-24 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for TextureBrush. + +2006-08-12 Duncan Mak + + * GDIPlusTest.csproj: New MSBuild project file for building + GDIPlusTest on Windows. + + * System.Drawing_test.dll.sources: Add gdipEnums.cs, + gdipFunctions.cs and gdipStructs.cs. + + * Makefile (TEST_MCS_FLAGS): Add new #define 'TEST'. This is used + to exclude parts of gdipFunctions so that it could be reused as + part of the NUnit tests. + +2006-08-02 Sebastien Pouliot + + * Makefile: Add the test bitmaps to EXTRA_DISTFILES so monobuild has + them available when running the unit tests. + +2006-07-06 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for direct GDI+ + function calls. + +2006-06-30 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for SolidBrush. + +2006-05-30 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for FontFamily. + +2006-05-17 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for Pen. + +2006-05-16 Vladimir Krasnov + + * run-tests.test.bat: skip nunit build if already done + +2006-05-09 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for + PathGradientBrush. + +2006-01-30 Boris Kirzner + * run-tests.test.bat: changed location of xmltool. + +2006-01-29 Boris Kirzner + * run-tests.bat, run-tests.test.bat, runtestfixture.bat, + runmonotestfixture.bat : added batch files for automatic + testing for TARGET_JVM. + +2006-01-18 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for RegionData and + non-rectangular Region. + +2006-01-12 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for GraphicsPath + and PathData. + +2006-01-11 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added CAS unit tests for Region to + the build. + +2005-12-05 Jordi Mas i Hernandez + * MetaHeader.cs: Classes need to specify StructLayout attribute * EncoderParameter.cs: Classes need to specify StructLayout attribute * ImageAttributes.cs: Classes need to specify StructLayout attribute * WmfPlaceableFileHeader.cs: Classes need to specify StructLayout attribute - * MetafileHeader.cs: Classes need to specify StructLayout attribute - -2005-12-04 Konstantin Triger - - * net_1_1_java_System.Drawing.dll.exclude.sources, - net_1_1_java_System.Drawing.dll.sources: - correcting SystemIcons.cs reference. - -2005-11-28 Konstantin Triger - - * System.Drawing.vmwcsproj: Added System icons; changed to mono icon implementation. - -2005-11-14 Andrew Skiba - - * net_1_1_java_System.Drawing.dll.sources, - net_1_1_java_System.Drawing.dll.exclude.sources: added java profile - sources lists - * Makefile: add java profile section - -2005-11-13 Konstantin Triger - - * System.Drawing.vmwcsproj: Added System.Drawing.Text/LineLayout.jvm.cs, - System.Drawing.Text/LineLayout.jvm.cs - -2005-09-27 Kornél Pál - - * Makefile: Removed /codepage:28591 as it is the default. - -2005-09-19 Miguel de Icaza - - * Makefile (EXTRA_DISTFILES): Distribute indexed.png, add resource - to build. - -2005-09-14 Vladimir Krasnov - - * System.Drawing.vmwcsproj: Added PlainImage.jvm.cs, PlainImageCollection.jvm.cs - -2005-09-07 Vladimir Krasnov - - * System.Drawing.vmwcsproj: ImageCodec.jvm.cs - Added Mainsoft.Drawing.Configuration.jvm folder with - ResolutionConfiguration.cs, ResolutionConfigurationCollection.cs, - ResolutionConfigurationHandler.cs - -2005-08-28 Vladimir Krasnov - - * System.Drawing.vmwcsproj: Added GraphicsContainer.jvm.cs, GraphicsState.jvm.cs - Excluded: GraphicsContainer.cs, GraphicsState.cs - Fixed: const.cs.in - -2005-08-25 Atsushi Enomoto - - * Makefile: build fix for some utf8-defaulted environment. - -2005-08-24 Marek Safar - - * SD.csproj: Updated. - -2005-08-23 Eyal Alalyf - * System.Drawing.vmwcsproj: Change it to be developer edition project file - -2005-08-23 Boris Kirzner - * System.Drawing.vmwcsproj: Changed reference to Consts.cs. - -2005-08-16 Andrew Skiba - - * System.Drawing.vmwcsproj: use ImageFormat.cs instead of jvm.cs - -2005-08-14 Gert Driesen - - * System.Drawing.dll.sources: Removed TestColorConverter again, as - there was already a test class for ColorConverter. - -2005-08-14 Gert Driesen - - * System.Drawing.dll.sources: Added TestColorConverter.cs. - -2005-08-14 Vladimir Krasnov - - * System.Drawing.vmwcsproj: Added SystemIcons.jvm.cs, excluded SystemIcons.cs - -2005-08-11 Konstantin Triger - - * System.Drawing.vmwcsproj: changing JAVA to TARGET_JVM in release builds - -2005-08-10 Boris Kirzner - * System.Drawing.vmwcsproj: Added ExtendedGeneralPath.jvm.cs and GeneralPathIterator.jvm.cs. - -2005-08-09 Konstantin Triger - - * System.Drawing.vmwcsproj: Added AdvancedStoke.jvm.cs and StrokeFactory.jvm.cs - -2005-08-09 Andrew Skiba - - * System.Drawing_test.dll.sources: add ColorConverter.cs and ColorTranslator.cs - -2005-08-07 Konstantin Triger - - * System.Drawing.vmwcsproj: removed source control dependency - -2005-08-03 Andrew Skiba - - * System.Drawing.vmwcsproj, System.Drawing.sln: add a project file and solution for building System.Drawing for Grasshopper - -2004-12-09 Geoff Norton - - * System.Drawing.dll.sources: Add System.Drawing/carbonFunctions.cs to the build - -2004-11-22 Ravindra - - * SD.csproj: Removed a wrong entry from files list. - -2004-09-16 Ravindra - - * SD.csproj: Added a VS.NET project file. It can be used to build - System.Drawing library on MS. - -2004-09-09 Sebastien Pouliot - - * System.Drawing_test.dll.sources: Added unit tests for - PrintingPermission and it's attribute class. - -2004-06-10 Ravindra - - * Makefile: Suppress compiler warning cs:618 for test dll. - -2004-06-03 Ravindra - - * Makefile: Updated. We don't need to define the flag - DECLARE_CDECL_DELEGATES anymore. As we have moved all the - codecs to libgdiplus. - -2004-05-26 Ravindra - - * System.Drawing_test.dll.sources: Added TestColor.cs to the test sources list. - -2004-05-20 Sanjay Gupta - - * System.Drawing_test.dll.sources: Added TestIcon.cs to the test sources list. - -2004-05-18 Ravindra - - * System.Drawing_test.dll.sources: Added TestHatchBrush.cs to the - test sources list. - * README: Added some guidelines for writing tests/samples. - -2004-05-17 Sanjay Gupta - - * System.Drawing_test.dll.sources: Added TestIconConverter.cs to the test sources list. - -2004-05-14 Sanjay Gupta - - * System.Drawing_test.dll.sources: Added TestImageConverter.cs and - TestImageFormatConverter.cs to the test sources list. - -2004-04-22 Ravindra - - * System.Drawing_test.dll.sources: Added TestPointConverter.cs, - TestRectangleConverter.cs and TestSizeConverter.cs to the test - sources list. - -2004-04-21 Ravindra - - * System.Drawing_test.dll.sources: Added TestPens.cs and - TestBrushes.cs to the test sources list. - -2004-04-16 Ravindra - - * System.Drawing_test.dll.sources: Added TestSystemPens.cs - to the test sources list. - -2004-04-12 Ravindra - - * System.Drawing_test.dll.sources: Added TestSystemBrushes.cs - to the test sources list. - -2004-03-18 Ravindra - * System.Drawing_test.dll.sources: Added TestBitmap.cs, - TestBlend.cs and TestColorBlend.cs to test sources list. - -2004-03-17 Ravindra - * Samples: Created directory for samples. - * README: Created README that tells about the directory - structure for samples and tests. - -2004-02-11 Ravindra - * System.Drawing.dll.sources: Added EncoderParameter.cs - and EncoderParameters.cs. - -2004-02-07 Andreas Nahr - - * System.Drawing.dll.sources: - SRDescriptionAttribute.cs, Locale.cs added - -2004-01-26 Ravindra - * System.Drawing.dll.sources: Added TextureBrush.cs. - -2004-01-26 Ravindra - * System.Drawing_test.dll.sources: Added to create - System.Drawing_test.dll. - -2004-01-23 Ravindra - * System.Drawing.dll.sources: Removed TextureBrush.cs. - Was added by mistake during last check-in. - -2004-01-19 Ravindra - * System.Drawing.dll.sources: Added Encoder.cs. - -2003-11-13 Andreas Nahr - * System.Drawing.dll.sources: MetafileHeader added (was missing), Consts.cs added - -2003-10-14 Bernie Solomon - * Makefile do not build gdiplus on Windows - -2003-10-12 Alexandre Pigolkine - * Makefile gdiplus added to subdirs - -2003-10-12 Alexandre Pigolkine - * System.Drawing.dll.sources: Remove cairo,win32,gtk implementations - Add gdi+ implementation - -2003-09-21 Miguel de Icaza - * System.Drawing.dll.sources: Remove xr implementation. - -2003-09-21 Alexandre Pigolkine - * System.Drawing.dll.sources removed 2 files from Printing namespace - -2003-08-31 Jerome Laban - * Graphics.cs: - * win32functions.cs: Added Win32 Ellipse implementation. - -2003-08-24 Duncan Mak - - * System.Drawing.dll.sources: Add Cairo implementation. - -2003-07-23 Peter Williams - - * System.Drawing.dll.sources: Add Pens.cs - -2003-07-17 Andreas Nahr - - * System.Drawing.dll.sources: - * list.unix: AssemblyInfo.cs added - -2003-06-27 Alexandre Pigolkine - * list.unix - new file added - -2003-06-22 Alexandre Pigolkine - * list.unix - reordered by folder names - few new files added - System.Drawing.Design/IDesignerHost.cs removed - -2003-06-18 Alexandre Pigolkine - * list.unix changed - -2003-06-15 Alexandre Pigolkine - * list.unix files added - * makefile.gnu --unsafe flag, cdecl delegates - -2003-06-06 Alexandre Pigolkine - * list.unix changed - -2003-04-26 Alexandre Pigolkine - * list.unix changed - -2003-03-31 Martin Willemoes Hansen - - * System.Drawing.Printing/PrinterUnitConvert.cs stubed - -2003-03-31 Martin Willemoes Hansen - - * System.Drawing.Design/ToolboxItemCollection.cs stubed - -2003-03-31 Alan Tam - - * list.unix: Added UITypeEditor.cs. - -2003-02-08 Gonzalo Paniagua Javier - - * list.unix: added ImageAttributes.cs. - -2003-02-07 Alexandre Pigolkine - * list.unix changed - -2002-12-1 Alejandro Sánchez Acosta - - * list.unix: Changed - - -2002-06-20 Gonzalo Paniagua Javier - - * ChangeLog: new file. - - * System.Drawing.build: added System.dll dependency - + * MetafileHeader.cs: Classes need to specify StructLayout attribute + +2005-12-04 Konstantin Triger + + * net_1_1_java_System.Drawing.dll.exclude.sources, + net_1_1_java_System.Drawing.dll.sources: + correcting SystemIcons.cs reference. + +2005-11-28 Konstantin Triger + + * System.Drawing.vmwcsproj: Added System icons; changed to mono icon implementation. + +2005-11-14 Andrew Skiba + + * net_1_1_java_System.Drawing.dll.sources, + net_1_1_java_System.Drawing.dll.exclude.sources: added java profile + sources lists + * Makefile: add java profile section + +2005-11-13 Konstantin Triger + + * System.Drawing.vmwcsproj: Added System.Drawing.Text/LineLayout.jvm.cs, + System.Drawing.Text/LineLayout.jvm.cs + +2005-09-27 Kornél Pál + + * Makefile: Removed /codepage:28591 as it is the default. + +2005-09-19 Miguel de Icaza + + * Makefile (EXTRA_DISTFILES): Distribute indexed.png, add resource + to build. + +2005-09-14 Vladimir Krasnov + + * System.Drawing.vmwcsproj: Added PlainImage.jvm.cs, PlainImageCollection.jvm.cs + +2005-09-07 Vladimir Krasnov + + * System.Drawing.vmwcsproj: ImageCodec.jvm.cs + Added Mainsoft.Drawing.Configuration.jvm folder with + ResolutionConfiguration.cs, ResolutionConfigurationCollection.cs, + ResolutionConfigurationHandler.cs + +2005-08-28 Vladimir Krasnov + + * System.Drawing.vmwcsproj: Added GraphicsContainer.jvm.cs, GraphicsState.jvm.cs + Excluded: GraphicsContainer.cs, GraphicsState.cs + Fixed: const.cs.in + +2005-08-25 Atsushi Enomoto + + * Makefile: build fix for some utf8-defaulted environment. + +2005-08-24 Marek Safar + + * SD.csproj: Updated. + +2005-08-23 Eyal Alalyf + * System.Drawing.vmwcsproj: Change it to be developer edition project file + +2005-08-23 Boris Kirzner + * System.Drawing.vmwcsproj: Changed reference to Consts.cs. + +2005-08-16 Andrew Skiba + + * System.Drawing.vmwcsproj: use ImageFormat.cs instead of jvm.cs + +2005-08-14 Gert Driesen + + * System.Drawing.dll.sources: Removed TestColorConverter again, as + there was already a test class for ColorConverter. + +2005-08-14 Gert Driesen + + * System.Drawing.dll.sources: Added TestColorConverter.cs. + +2005-08-14 Vladimir Krasnov + + * System.Drawing.vmwcsproj: Added SystemIcons.jvm.cs, excluded SystemIcons.cs + +2005-08-11 Konstantin Triger + + * System.Drawing.vmwcsproj: changing JAVA to TARGET_JVM in release builds + +2005-08-10 Boris Kirzner + * System.Drawing.vmwcsproj: Added ExtendedGeneralPath.jvm.cs and GeneralPathIterator.jvm.cs. + +2005-08-09 Konstantin Triger + + * System.Drawing.vmwcsproj: Added AdvancedStoke.jvm.cs and StrokeFactory.jvm.cs + +2005-08-09 Andrew Skiba + + * System.Drawing_test.dll.sources: add ColorConverter.cs and ColorTranslator.cs + +2005-08-07 Konstantin Triger + + * System.Drawing.vmwcsproj: removed source control dependency + +2005-08-03 Andrew Skiba + + * System.Drawing.vmwcsproj, System.Drawing.sln: add a project file and solution for building System.Drawing for Grasshopper + +2004-12-09 Geoff Norton + + * System.Drawing.dll.sources: Add System.Drawing/carbonFunctions.cs to the build + +2004-11-22 Ravindra + + * SD.csproj: Removed a wrong entry from files list. + +2004-09-16 Ravindra + + * SD.csproj: Added a VS.NET project file. It can be used to build + System.Drawing library on MS. + +2004-09-09 Sebastien Pouliot + + * System.Drawing_test.dll.sources: Added unit tests for + PrintingPermission and it's attribute class. + +2004-06-10 Ravindra + + * Makefile: Suppress compiler warning cs:618 for test dll. + +2004-06-03 Ravindra + + * Makefile: Updated. We don't need to define the flag + DECLARE_CDECL_DELEGATES anymore. As we have moved all the + codecs to libgdiplus. + +2004-05-26 Ravindra + + * System.Drawing_test.dll.sources: Added TestColor.cs to the test sources list. + +2004-05-20 Sanjay Gupta + + * System.Drawing_test.dll.sources: Added TestIcon.cs to the test sources list. + +2004-05-18 Ravindra + + * System.Drawing_test.dll.sources: Added TestHatchBrush.cs to the + test sources list. + * README: Added some guidelines for writing tests/samples. + +2004-05-17 Sanjay Gupta + + * System.Drawing_test.dll.sources: Added TestIconConverter.cs to the test sources list. + +2004-05-14 Sanjay Gupta + + * System.Drawing_test.dll.sources: Added TestImageConverter.cs and + TestImageFormatConverter.cs to the test sources list. + +2004-04-22 Ravindra + + * System.Drawing_test.dll.sources: Added TestPointConverter.cs, + TestRectangleConverter.cs and TestSizeConverter.cs to the test + sources list. + +2004-04-21 Ravindra + + * System.Drawing_test.dll.sources: Added TestPens.cs and + TestBrushes.cs to the test sources list. + +2004-04-16 Ravindra + + * System.Drawing_test.dll.sources: Added TestSystemPens.cs + to the test sources list. + +2004-04-12 Ravindra + + * System.Drawing_test.dll.sources: Added TestSystemBrushes.cs + to the test sources list. + +2004-03-18 Ravindra + * System.Drawing_test.dll.sources: Added TestBitmap.cs, + TestBlend.cs and TestColorBlend.cs to test sources list. + +2004-03-17 Ravindra + * Samples: Created directory for samples. + * README: Created README that tells about the directory + structure for samples and tests. + +2004-02-11 Ravindra + * System.Drawing.dll.sources: Added EncoderParameter.cs + and EncoderParameters.cs. + +2004-02-07 Andreas Nahr + + * System.Drawing.dll.sources: + SRDescriptionAttribute.cs, Locale.cs added + +2004-01-26 Ravindra + * System.Drawing.dll.sources: Added TextureBrush.cs. + +2004-01-26 Ravindra + * System.Drawing_test.dll.sources: Added to create + System.Drawing_test.dll. + +2004-01-23 Ravindra + * System.Drawing.dll.sources: Removed TextureBrush.cs. + Was added by mistake during last check-in. + +2004-01-19 Ravindra + * System.Drawing.dll.sources: Added Encoder.cs. + +2003-11-13 Andreas Nahr + * System.Drawing.dll.sources: MetafileHeader added (was missing), Consts.cs added + +2003-10-14 Bernie Solomon + * Makefile do not build gdiplus on Windows + +2003-10-12 Alexandre Pigolkine + * Makefile gdiplus added to subdirs + +2003-10-12 Alexandre Pigolkine + * System.Drawing.dll.sources: Remove cairo,win32,gtk implementations + Add gdi+ implementation + +2003-09-21 Miguel de Icaza + * System.Drawing.dll.sources: Remove xr implementation. + +2003-09-21 Alexandre Pigolkine + * System.Drawing.dll.sources removed 2 files from Printing namespace + +2003-08-31 Jerome Laban + * Graphics.cs: + * win32functions.cs: Added Win32 Ellipse implementation. + +2003-08-24 Duncan Mak + + * System.Drawing.dll.sources: Add Cairo implementation. + +2003-07-23 Peter Williams + + * System.Drawing.dll.sources: Add Pens.cs + +2003-07-17 Andreas Nahr + + * System.Drawing.dll.sources: + * list.unix: AssemblyInfo.cs added + +2003-06-27 Alexandre Pigolkine + * list.unix + new file added + +2003-06-22 Alexandre Pigolkine + * list.unix + reordered by folder names + few new files added + System.Drawing.Design/IDesignerHost.cs removed + +2003-06-18 Alexandre Pigolkine + * list.unix changed + +2003-06-15 Alexandre Pigolkine + * list.unix files added + * makefile.gnu --unsafe flag, cdecl delegates + +2003-06-06 Alexandre Pigolkine + * list.unix changed + +2003-04-26 Alexandre Pigolkine + * list.unix changed + +2003-03-31 Martin Willemoes Hansen + + * System.Drawing.Printing/PrinterUnitConvert.cs stubed + +2003-03-31 Martin Willemoes Hansen + + * System.Drawing.Design/ToolboxItemCollection.cs stubed + +2003-03-31 Alan Tam + + * list.unix: Added UITypeEditor.cs. + +2003-02-08 Gonzalo Paniagua Javier + + * list.unix: added ImageAttributes.cs. + +2003-02-07 Alexandre Pigolkine + * list.unix changed + +2002-12-1 Alejandro Sánchez Acosta + + * list.unix: Changed + + +2002-06-20 Gonzalo Paniagua Javier + + * ChangeLog: new file. + + * System.Drawing.build: added System.dll dependency + diff --git a/mcs/class/System.Drawing/Test/ChangeLog b/mcs/class/System.Drawing/Test/ChangeLog index 83d66580ac2..555c26f7937 100644 --- a/mcs/class/System.Drawing/Test/ChangeLog +++ b/mcs/class/System.Drawing/Test/ChangeLog @@ -1,3 +1,8 @@ +2006-08-28 Boris Kirzner + * System.Drawing.Test20.J2EE.sln, System.Drawing.Test20.sln, + Test20.csproj, Test20.J2EE.vmwcsproj: added solution + and project files for NET_2_0 tests. + 2006-01-25 Boris Kirzner * Test.vmwcsproj,Test.dotnet.csproj: added reference to NUnit projects. diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog index 6520cf2fe71..f1950dd1cdb 100644 --- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog +++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/ChangeLog @@ -1,3 +1,7 @@ +2006-08-28 Boris Kirzner + * DrawingTestHelper20.csproj, DrawingTestHelper20.J2EE.vmwcsproj : + added project files for NET_2_0 tests. + 2006-01-25 Boris Kirzner * DrawingTestHelper_java.vmwcsproj, DrawingTestHelper.csproj: projects updates for TARGET_JVM. diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj new file mode 100644 index 00000000000..e7161f73a44 --- /dev/null +++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.J2EE.vmwcsproj @@ -0,0 +1,131 @@ + + + bin\Release_Java20\ + TRACE;TARGET_JVM;NET_1_1;NET_2_0 + 285212672 + true + pdbonly + AnyCPU + prompt + false + false + 1 + false + + + + + 2.0 + 1.5.0_05 + 0 + + + true + bin\Debug_Java20\ + TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0 + 285212672 + full + AnyCPU + prompt + True + False + 1 + false + + + + + 2.0 + 1.5.0_05 + 0 + + + Debug_Java + AnyCPU + 8.0.50727 + 2.0 + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF} + Library + Properties + DrawingTest + DrawingTest + 1.5.0_05 + 1 + 2.0 + + + true + full + false + bin\Debug_Java\ + TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1 + prompt + 4 + 285212672 + false + True + False + 0 + + + + + pdbonly + true + bin\Release_Java\ + TRACE;TARGET_JVM;NET_1_1;ONLY_1_1 + prompt + 4 + 285212672 + false + false + false + 0 + + + + + + False + ..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\J2SE.Helpers.dll + + + False + c:\cygwin\monobuild\mcs\nunit20\framework\bin\Debug_Java20\nunit.framework.dll + True + + + False + ..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\jre5\rt.dll + True + + + + + + + + + + + + + {995DE32D-06AB-4926-97FF-565B9205D5F8} + Exocortex.DSP20.v1.J2EE + + + + + + + + + + + diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj new file mode 100644 index 00000000000..b32803cb291 --- /dev/null +++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTestHelper20.csproj @@ -0,0 +1,61 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {0E97F734-51B9-497B-9259-B6999FD87BDF} + Library + Properties + DrawingTest + DrawingTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\..\..\..\nunit20\framework\bin\Debug\nunit.framework.dll + + + + + + + + + + + + + + {A9553E24-D07E-44FE-92FB-8C1D3D3C744E} + Exocortex.DSP20.v1 + + + + + \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj new file mode 100644 index 00000000000..55c87edc55e --- /dev/null +++ b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.J2EE.vmwcsproj @@ -0,0 +1,122 @@ + + + bin\Release_Java20\ + TRACE;TARGET_JVM;NET_1_1;NET_2_0 + 285212672 + true + pdbonly + AnyCPU + prompt + false + false + 1 + false + + + + + 2.0 + 1.5.0_05 + 0 + + + true + bin\Debug_Java20\ + TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0 + 285212672 + full + AnyCPU + prompt + True + False + 1 + false + + + + + 2.0 + 1.5.0_05 + 0 + + + Debug_Java + AnyCPU + 8.0.50727 + 2.0 + {995DE32D-06AB-4926-97FF-565B9205D5F8} + Library + Properties + Exocortex.DSP + Exocortex.DSP.v1 + 1.5.0_05 + 1 + 2.0 + + + true + full + false + bin\Debug_Java\ + TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1 + prompt + 4 + 285212672 + false + True + False + 0 + + + + + pdbonly + true + bin\Release_Java\ + TRACE;TARGET_JVM;NET_1_1;ONLY_1_1 + prompt + 4 + 285212672 + false + false + false + 0 + + + + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj new file mode 100644 index 00000000000..f595cfb3978 --- /dev/null +++ b/mcs/class/System.Drawing/Test/DrawingTest/Exocortex.DSP/src/Exocortex.DSP20.v1.csproj @@ -0,0 +1,55 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {A9553E24-D07E-44FE-92FB-8C1D3D3C744E} + Library + Properties + Exocortex.DSP + Exocortex.DSP.v1 + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln b/mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln new file mode 100644 index 00000000000..cb10c015999 --- /dev/null +++ b/mcs/class/System.Drawing/Test/System.Drawing.Test20.J2EE.sln @@ -0,0 +1,46 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Exocortex.DSP20.v1.J2EE", "DrawingTest\Exocortex.DSP\src\Exocortex.DSP20.v1.J2EE.vmwcsproj", "{995DE32D-06AB-4926-97FF-565B9205D5F8}" +EndProject +Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "DrawingTestHelper20.J2EE", "DrawingTest\DrawingTestHelper\DrawingTestHelper20.J2EE.vmwcsproj", "{C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}" +EndProject +Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "Test20.J2EE", "Test20.J2EE.vmwcsproj", "{FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_Java|Any CPU = Debug_Java|Any CPU + Debug_Java20|Any CPU = Debug_Java20|Any CPU + Release_Java|Any CPU = Release_Java|Any CPU + Release_Java20|Any CPU = Release_Java20|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU + {995DE32D-06AB-4926-97FF-565B9205D5F8}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Test20.sln b/mcs/class/System.Drawing/Test/System.Drawing.Test20.sln new file mode 100644 index 00000000000..56541f75934 --- /dev/null +++ b/mcs/class/System.Drawing/Test/System.Drawing.Test20.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test20", "Test20.csproj", "{0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingTestHelper20", "DrawingTest\DrawingTestHelper\DrawingTestHelper20.csproj", "{0E97F734-51B9-497B-9259-B6999FD87BDF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exocortex.DSP20.v1", "DrawingTest\Exocortex.DSP\src\Exocortex.DSP20.v1.csproj", "{A9553E24-D07E-44FE-92FB-8C1D3D3C744E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE}.Release|Any CPU.Build.0 = Release|Any CPU + {0E97F734-51B9-497B-9259-B6999FD87BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E97F734-51B9-497B-9259-B6999FD87BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E97F734-51B9-497B-9259-B6999FD87BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E97F734-51B9-497B-9259-B6999FD87BDF}.Release|Any CPU.Build.0 = Release|Any CPU + {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9553E24-D07E-44FE-92FB-8C1D3D3C744E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj b/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj new file mode 100644 index 00000000000..3c4fc829410 --- /dev/null +++ b/mcs/class/System.Drawing/Test/Test20.J2EE.vmwcsproj @@ -0,0 +1,171 @@ + + + DrawingTest\Test\bin\Debug_Java20\ + TRACE;TARGET_JVM;NET_1_1;NET_2_0 + 285212672 + true + pdbonly + AnyCPU + prompt + false + false + 1 + false + + + + + 2.0 + 1.5.0_05 + 0 + + + true + DrawingTest\Test\bin\Debug_Java20\ + TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0 + 285212672 + full + AnyCPU + prompt + True + False + 1 + false + + + + + 2.0 + 1.5.0_05 + 0 + + + Debug_Java + AnyCPU + 8.0.50727 + 2.0 + {FD3F01E4-4F19-4124-BD9C-226C3E8D55B3} + Library + Properties + System.Drawing.Test + System.Drawing.Test20.J2EE + 1.5.0_05 + 1 + 2.0 + + + true + full + false + bin\Debug_Java\ + TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1 + prompt + 4 + 285212672 + false + True + False + 0 + + + + + pdbonly + true + bin\Release_Java\ + TRACE;TARGET_JVM;NET_1_1;ONLY_1_1 + prompt + 4 + 285212672 + false + false + false + 0 + + + + + + False + + + False + c:\cygwin\monobuild\mcs\nunit20\framework\bin\Debug_Java20\nunit.framework.dll + True + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {C4329BA9-2E08-4EB3-B6ED-0FA3BB6285AF} + DrawingTestHelper20.J2EE + + + + + + + + + + + \ No newline at end of file diff --git a/mcs/class/System.Drawing/Test/Test20.csproj b/mcs/class/System.Drawing/Test/Test20.csproj new file mode 100644 index 00000000000..fba47bc6c07 --- /dev/null +++ b/mcs/class/System.Drawing/Test/Test20.csproj @@ -0,0 +1,117 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {0E95EEE1-AE3C-41E9-8A9C-0F0A05A594BE} + Library + Properties + System.Drawing.Test + System.Drawing.Test + + + + + true + full + false + DrawingTest\Test\ + TRACE;DEBUG;NET_2_0 + prompt + 4 + + + pdbonly + true + DrawingTest\Test\ + TRACE + prompt + 4 + + + + False + ..\..\..\nunit20\framework\bin\Debug\nunit.framework.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {0E97F734-51B9-497B-9259-B6999FD87BDF} + DrawingTestHelper20 + + + + + \ No newline at end of file diff --git a/mcs/class/System.Drawing/run-tests.test.bat b/mcs/class/System.Drawing/run-tests.test.bat index aff33a105ed..eb3c39dacaa 100644 --- a/mcs/class/System.Drawing/run-tests.test.bat +++ b/mcs/class/System.Drawing/run-tests.test.bat @@ -15,9 +15,7 @@ REM ******************************************************** IF "%1"=="" GOTO USAGE -IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION - -IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION +IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION REM ******************************************************** REM Set parameters @@ -29,12 +27,21 @@ set RUNNING_FIXTURE=%3 set RUNNING_DIR=%~4 set BACK_TO_ROOT_DIR=%~5 +set TEST_J2EE_SOLUTION=Test\System.Drawing.Test20.J2EE.sln +set TEST_NET_SOLUTION=Test\System.Drawing.Test20.sln +set TEST_J2EE_ASSEMBLY=System.Drawing.Test20.J2EE.jar +set TEST_NET_ASSEMBLY=System.Drawing.Test.dll +set PROJECT_J2EE_CONFIGURATION=Debug_Java20 +set PROJECT_NET_CONFIGURATION=Debug +set NUNIT_CONSOLE_PATH="C:\Program Files\NUnit-Net-2.0 2.2.8\bin" +set JAVA_HOME=%VMW_HOME%\jre5 + REM ******************************************************** REM @echo Set environment REM ******************************************************** -set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\ +set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\ 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 @@ -43,7 +50,7 @@ set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\ -set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar +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%" @@ -51,9 +58,23 @@ REM ******************************************************** @echo Building .Net solution... 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 + +IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION + + + if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP -devenv Test\DrawingTest\System.Drawing.Test.dotnet.sln /%BUILD_OPTION% Debug >%RUNNING_FIXTURE%_build.log.txt 2<&1 +REM ******************************************************** +@echo Building NUnit solution... +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 + +IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION goto NUNITREADY @@ -69,15 +90,8 @@ REM ******************************************************** @echo Building GH solution... REM ******************************************************** -devenv Test\DrawingTest\System.Drawing.Test.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1 - -IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION - -REM ******************************************************** -@echo Building NUnit solution... -REM ******************************************************** - -devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1 +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 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION @@ -98,14 +112,14 @@ if not exist Exocortex.DSP.v1.dll ( if not exist DrawingTest.dll ( copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\DrawingTest.dll . ) -if not exist Test.dotnet.dll ( - copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\Test.dotnet.dll . ) +if not exist %TEST_NET_ASSEMBLY% ( + copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\%TEST_NET_ASSEMBLY% . ) -copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.exe" . -copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.dll" . -copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.dll" . -copy "%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.dll" . -nunit-console.exe /fixture:%RUNNING_FIXTURE% Test.dotnet.dll %NUNIT_OPTIONS% /xml=%NET_OUTPUT_XML% >%RUNNING_FIXTURE%_run.log.txt 2<&1 +copy "%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit-console.exe" . +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 REM ******************************************************** @@ -116,13 +130,13 @@ REM ******************************************************** @echo Running fixture "%RUNNING_FIXTURE%" REM ******************************************************** -copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\Exocortex.DSP.v1.jar . -copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\DrawingTest.jar . -copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\Debug_Java\Test.jar . +copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\%PROJECT_J2EE_CONFIGURATION%\Exocortex.DSP.v1.jar . +copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\%PROJECT_J2EE_CONFIGURATION%\DrawingTest.jar . +copy %BACK_TO_ROOT_DIR%Test\DrawingTest\Test\bin\%PROJECT_J2EE_CONFIGURATION%\%TEST_J2EE_ASSEMBLY% . REM @echo on -"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi Test.jar /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% >>%RUNNING_FIXTURE%_run.log.txt 2<&1 REM @echo off if "%RUNNING_DIR%" NEQ "" ( @@ -134,11 +148,12 @@ REM ******************************************************** @echo Build XmlTool REM ******************************************************** set XML_TOOL_PATH=..\..\tools\mono-xmltool -devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1 +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 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION -copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe . +copy %XML_TOOL_PATH%\bin\%PROJECT_J2EE_CONFIGURATION%\xmltool.exe . copy %XML_TOOL_PATH%\nunit_transform.xslt . REM ******************************************************** @@ -152,7 +167,7 @@ xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML% GOTO END :ENVIRONMENT_EXCEPTION -@echo This test requires environment variables JAVA_HOME and GH_HOME to be defined +@echo This test requires environment variable VMW_HOME to be defined GOTO END :BUILD_EXCEPTION -- 2.25.1