* SoapSchemaExporterTests.cs: Sync expected results with changes in test

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

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 7274e2cdd867e67fc9f947577843e7d9d574c752..1843df674ae8d542206fe43b41393522b8a25a0d 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -5,12 +5,6 @@ include ../../build/rules.make
 LIBRARY = System.Xml.dll
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-ifeq ($(PROFILE),atomic)
-SCARY_LIB=
-else
-SCARY_LIB=/lib:$(prefix)/lib /noconfig
-endif
-
 lib_file := $(wildcard ../lib/$(PROFILE)/System.Xml.dll)
 ifndef lib_file
 # In the basic profile, System.Xml.dll is _not_ a dependency of mcs.exe.  So, don't use boot compilation.
@@ -28,8 +22,27 @@ ifdef USE_BOOT_COMPILE
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 endif
 
-LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe /r:$(corlib) /r:System.dll /nowarn:0162 /nowarn:0618 /nowarn:0612
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0162,0618,0612,0642,1595
+ifeq (net_1_1_java, $(PROFILE))
+LIB_MCS_FLAGS += \
+       -r:System.Xml.dll               \
+       -r:rt.dll                       \
+       -r:J2SE.Helpers.dll             \
+       -r:unresolved.dll               \
+       /lib:../../class/lib/$(PROFILE)
+endif
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
+
+nist_dom_files = \
+       ChangeLog ITest.cs readme.txt util.cs \
+       fundamental/ChangeLog \
+       files/ChangeLog files/noDTDXMLfile.xml files/otherDoc.xml files/staff.dtd files/staff.html files/staff.xml
+
+xmlfiles_files = \
+       ChangeLog nested-included.dtd literal-data.xml nested-dtd-test.dtd nested-dtd-test.xml simple.xml \
+       xsl/ChangeLog xsl/empty.xsl \
+       XsdValidation/ChangeLog XsdValidation/1.xsd XsdValidation/2.xsd XsdValidation/3.xsd XsdValidation/4.xsd \
+       xsd/ChangeLog xsd/1.xsd xsd/2.xsd xsd/3.xsd xsd/4.xsd xsd/5.xsd xsd/6.xsd xsd/xml.xsd
 
 EXTRA_DISTFILES = \
        Mono.System.XML.csproj          \
@@ -40,15 +53,12 @@ EXTRA_DISTFILES = \
        $(wildcard System.Xml.Serialization/standalone_tests/*.cs) \
        $(wildcard System.Xml.Serialization/standalone_tests/*.output) \
        System.Xml.XPath/Parser.jay     \
-       System.Xml.Query/skeleton-2.0.cs        \
+       Test/ChangeLog                  \
        Test/Microsoft.Test.csproj      \
        Test/Mono.Test.csproj           \
        Test/MonoMicro.Test.csproj      \
-       Test/XmlFiles/xsd/xml.xsd       \
-       Test/XmlFiles/xsd/ChangeLog     \
-       Test/XmlFiles/xsl/empty.xsl     \
-       Test/XmlFiles/xsl/ChangeLog     \
-       Test/XmlFiles/ChangeLog
+       $(xmlfiles_files:%=Test/XmlFiles/%) \
+       $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
 System.Xml.XPath/Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@