Reenable some NotWorking test cases.

[mono.git] / mcs / class / System.Drawing / Makefile

diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index 527c255808dfc4f84c5baf3eed7a4d39e5ef3d25..95f950e2be60880334f315dd553471c14d490a1c 100644 (file)
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -4,38 +4,59 @@ SUBDIRS =
 
 LIBRARY = System.Drawing.dll
 
-LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169
+LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169 \
+       -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \
+       -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
+       -resource:Assembly/Question.ico,Question.ico
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -resource:Test/resources/indexed.png,indexed.png \
-        /r:System.Drawing.dll -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \
+        -r:System.Drawing.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Xml.dll \
+       -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
 
 ifeq (net_1_1_java, $(PROFILE))
 LIB_MCS_FLAGS +=                               \
        -r:System.Xml.dll                       \
        -r:rt.dll                               \
-       -r:J2SE.Helpers.dll \
-       -res:Assembly\Application.ico \
-       -res:Assembly\Asterisk.ico \
-       -res:Assembly\Error.ico \
-       -res:Assembly\Exclamation.ico \
-       -res:Assembly\Hand.ico \
-       -res:Assembly\Information.ico \
-       -res:Assembly\Question.ico  \
-       -res:Assembly\Warning.ico \
-       -res:Assembly\WinLogo.ico
-
-EXTRA_DISTFILES =      \
-       Assembly\Application.ico \
-       Assembly\Asterisk.ico \
-       Assembly\Error.ico \
-       Assembly\Exclamation.ico \
-       Assembly\Hand.ico \
-       Assembly\Information.ico \
-       Assembly\Question.ico  \
-       Assembly\Warning.ico \
-       Assembly\WinLogo.ico
+       -r:J2SE.Helpers.dll
 endif
 
 include ../../build/library.make
 
-EXTRA_DISTFILES = Test/resources/indexed.png
\ No newline at end of file
+EXTRA_DISTFILES = Test/resources/indexed.png   \
+       Test/System.Drawing/bitmaps/1bit.png    \
+       Test/System.Drawing/bitmaps/4bit.png    \
+       Test/System.Drawing/bitmaps/almogaver1bit.bmp   \
+       Test/System.Drawing/bitmaps/almogaver24bits1.bmp        \
+       Test/System.Drawing/bitmaps/almogaver24bits.bmp \
+       Test/System.Drawing/bitmaps/almogaver32bits.bmp \
+       Test/System.Drawing/bitmaps/almogaver32bits.tif \
+       Test/System.Drawing/bitmaps/almogaver8bits.bmp  \
+       Test/System.Drawing/bitmaps/almogaver-os2.bmp   \
+       Test/System.Drawing/bitmaps/maketransparent.bmp \
+       Test/System.Drawing/bitmaps/nature24bits.gif    \
+       Test/System.Drawing/bitmaps/nature24bits87.gif  \
+       Test/System.Drawing/bitmaps/nature24bits.jpg    \
+       Test/System.Drawing/bitmaps/smiley.ico  \
+       Test/System.Drawing/bitmaps/VisualPng1.ico      \
+       Test/System.Drawing/bitmaps/VisualPng.ico       \
+       Test/System.Drawing/bitmaps/16x16x16.ico        \
+       Test/System.Drawing/bitmaps/32x32x16.ico        \
+       Test/System.Drawing/bitmaps/48x48x1.ico \
+       Test/System.Drawing/bitmaps/64x64x256.ico       \
+       Test/System.Drawing/bitmaps/96x96x256.ico       \
+       Test/System.Drawing/bitmaps/32bpp.ico   \
+       Test/System.Drawing/bitmaps/80509.ico   \
+       Test/System.Drawing/bitmaps/non-inverted.bmp    \
+       Test/System.Drawing/bitmaps/milkmateya01.emf    \
+       Test/System.Drawing/bitmaps/telescope_01.wmf    \
+       Assembly/Application.ico        \
+       Assembly/Asterisk.ico           \
+       Assembly/Error.ico              \
+       Assembly/Exclamation.ico        \
+       Assembly/Hand.ico               \
+       Assembly/Information.ico        \
+       Assembly/Question.ico           \
+       Assembly/Warning.ico            \
+       Assembly/WinLogo.ico            \
+       Assembly/Mono.ico               \
+       nunit-host-ignore-list