projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Loading of nested type of missing type needs to create another missing type. Fixes...
[mono.git] / mcs / errors / Makefile
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 105862568c6489b267e1939b138fec733eb5a8a2..756d130359a64a00c933e61a0301bee7edac65d2 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -4,41 +4,48 @@ include ../build/rules.make
 
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 
-EXTRA_SUPPORT_FILES = CSFriendAssembly-lib.dll GCS0122-2-lib.dll GCS0730-lib.dll GCS0733-lib.dll GCS1685-lib.dll
-
 ilasm = $(topdir)/class/lib/$(PROFILE)/ilasm.exe
 ILASM = $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
 
 DISTFILES = \
        CONTRIBUTORS_README     \
        errors.txt              \
-       do-tests.pl             \
        $(wildcard *.cs)        \
        $(wildcard *.il)        \
        $(wildcard *.inc)       \
        $(wildcard *.pub)       \
        $(wildcard *.snk)       \
        $(wildcard *.response)  \
-       $(wildcard known-issues-*)
+       $(wildcard known-issues-*)      \
+       $(wildcard dlls/first/*.cs)     \
+       $(wildcard dlls/second/*.cs)
 
 TEST_SUPPORT_FILES = \
-       CS0118-2-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0122-19-lib.dll CS0144-3-lib.dll \
-       CS0205-3-lib.dll \
-       CS0229-3-lib.dll CS0229-4-lib.dll \
-       CS0433-lib.dll CS0433-2-lib.dll \
-       CS0534-3-lib.dll CS0534-4-lib.dll CS0571-3-lib.dll CS0571-5-lib.dll CS0571-6-lib.dll \
+       CS0012-lib.dll CS0012-2-lib.dll CS0012-3-lib.dll CS0012-4-lib.dll CS0012-5-lib.dll CS0012-6-lib.dll CS0012-9-lib.dll CS0012-10-lib.dll CS0012-11-lib.dll CS0012-12-lib.dll CS0012-13-lib.dll CS0012-14-lib.dll CS0012-15-lib.dll CS0012-16-lib.dll CS0012-17-lib.dll CS0012-18-lib.dll CS0012-21-lib.dll CS0029-26-lib.dll \
+       CS0103-2-lib.dll CS0118-2-lib.dll CS0122-8-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0122-19-lib.dll CS0122-35-lib.dll CS0122-36-lib.dll CS0143-lib.dll CS0144-3-lib.dll CS0165-19-lib.dll \
+       CS0205-3-lib.dll CS0229-3-lib.dll CS0229-4-lib.dll CS0266-25-lib.dll \
+       CS0315-2-lib.dll \
+       CS0425-7-lib.dll CS0433-lib.dll CS0433-2-lib.dll \
+       CS0506-3-lib.dll CS0507-7-lib.dll CS0507-8-lib.dll CS0534-3-lib.dll CS0534-4-lib.dll CS0534-6-lib.dll CS0571-3-lib.dll CS0571-5-lib.dll CS0571-6-lib.dll \
        CS0612-2-lib.dll CS0618-2-lib.dll CS0619-8-lib.dll CS0619-17-lib.dll CS0619-32-lib.dll CS0619-33-lib.dll CS0619-36-lib.dll CS0619-42-lib.dll \
        CS0619-43-lib.dll CS1546-lib.dll CS0619-51-lib.dll CS1509-module.dll CS1681-2-lib.dll \
+       CS0730-lib.dll \
+       CS1070-lib.dll \
+       CS1540-15-lib.dll CS1540-17-lib.dll CS1542-lib.dll CS1577-lib.dll \
+       CS1607-3-lib.dll CS1683-lib.dll CS1684-lib.dll CS1685-2-lib.dll \
+       dlls/first/CS1701-lib.dll dlls/second/CS1701-lib.dll CS1701-lib.dll dlls/first/CS1702-lib.dll dlls/second/CS1702-lib.dll CS1702-lib.dll dlls/first/CS1705-lib.dll dlls/second/CS1705-lib.dll CS1705-lib.dll \
        CS2015-lib.dll CS3005-16-lib.dll CS3013-module.dll CSExternAlias-lib.dll \
-       $(EXTRA_SUPPORT_FILES) 
+       CSFriendAssembly-lib.dll \
+       dlls/first/CS1703-lib.dll dlls/first/CS1704-lib.dll \
+       dlls/second/CS1703-lib.dll dlls/second/CS1704-lib.dll
 
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_4_5, $(PROFILE))
 ifdef VALID_PROFILE
 
-check: run-mcs-tests 
+qcheck: run-mcs-tests 
 
 # again, run-test is when the tests actually happen, so
 # don't compile on make test.
@@ -49,43 +56,38 @@ test-local:
 run-test-local: clean-local
        $(MAKE) run-mcs-tests
 
-ifeq (net_4_0, $(PROFILE))
-COMPILER_NAME = dmcs
+# Required to test parser correctly
+# -compiler-options:-v
+
 TEST_PATTERN = 'v4'
-endif
-ifeq (moonlight, $(PROFILE))
-COMPILER_NAME = smcs
-TEST_PATTERN = 'v2'
-LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
-endif
-ifeq (net_2_0, $(PROFILE))
-COMPILER_NAME = gmcs
-TEST_PATTERN = 'v2'
-endif
+TESTER_OPTIONS = -compiler-options:"-v -d:NET_4_0;NET_4_5"
 
-COMPILER = $(topdir)/class/lib/$(PROFILE)/$(COMPILER_NAME).exe
+COMPILER = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/mcs.exe
 TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(LOCAL_RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe
 
-# Required to test parser correctly
-TESTER_OPTIONS +=-compiler-options:-v
-
 run-mcs-tests: $(TEST_SUPPORT_FILES)
-       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TESTER_OPTIONS)
-
-cecil:
-       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:../tests/gmcs.exe -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TESTER_OPTIONS) -verbose
+       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log $(TESTER_OPTIONS) $(TOPTIONS)
 
 endif
 
 clean-local:
-       rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk
+       rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk dlls/first/*.dll dlls/second/*.dll
 
 dist-local: dist-default
 
 csproj-local install-local uninstall-local:
 
+CS1701-lib.dll : CS1701-lib.cs
+       $(CSCOMPILE) /target:library /warn:0 /r:dlls/first/CS1701-lib.dll /out:$@ $<
+
+CS1702-lib.dll : CS1702-lib.cs
+       $(CSCOMPILE) /target:library /warn:0 /r:dlls/first/CS1702-lib.dll /out:$@ $<
+
+CS1705-lib.dll : CS1705-lib.cs
+       $(CSCOMPILE) /target:library /warn:0 /r:dlls/first/CS1705-lib.dll /out:$@ $<
+
 %-lib.dll: %-lib.cs
-       $(CSCOMPILE) /target:library /out:$@ $<
+       $(CSCOMPILE) /target:library /warn:0 /out:$@ $<
 
 %-module.dll: %-module.cs
        $(CSCOMPILE) /target:module /out:$@ $<
my mono mirror. check out Moved to http://github.com/mono/mono