diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-09-25 15:56:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 15:56:15 +0300 |
| commit | fe590b4eb0f967121fbaffdeab8a70bb8bc034c4 (patch) | |
| tree | cfd59797fd0b914b7b86bdca53098a2866c38fff /mcs/errors | |
| parent | 22d5a4d552208b19ab1c1ee21d9c4dcf8f9bf07a (diff) | |
[mcs] Add option to specify reference directory to compiler-tester (#10787)
We can use this to pass a directory the tests can use for -r or -lib.
Also fix cs1703-2.cs to not rely on binary outside repo during test.
Diffstat (limited to 'mcs/errors')
| -rw-r--r-- | mcs/errors/Makefile | 9 | ||||
| -rw-r--r-- | mcs/errors/cs1703-2.cs | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile index b9575562923..6a247725be3 100644 --- a/mcs/errors/Makefile +++ b/mcs/errors/Makefile @@ -34,7 +34,8 @@ TEST_SUPPORT_FILES = \ CS8009-lib.dll \ CSFriendAssembly-lib.dll \ dlls/first/CS1704-lib.dll \ - dlls/second/CS1704-lib.dll + dlls/second/CS1704-lib.dll \ + dlls/cs1703-2/System.dll -include $(mcs_topdir)/build/config.make @@ -67,7 +68,7 @@ COMPILER = $(topdir)/class/lib/$(PROFILE)/mcs.exe TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(LOCAL_RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe run-mcs-tests: $(TEST_SUPPORT_FILES) - $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log $(TESTER_OPTIONS) $(TOPTIONS) + $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -reference-dir:$(topdir)/class/lib/$(PROFILE) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log $(TESTER_OPTIONS) $(TOPTIONS) endif @@ -108,6 +109,10 @@ dlls/second/CS1703-lib.dll: dlls/second/CS1703-lib.cs dlls/second/CS1705-lib.dll: dlls/second/CS1705-lib.cs $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< +dlls/cs1703-2/System.dll: $(topdir)/../external/binary-reference-assemblies/v2.0/System.dll + mkdir -p $(dir $@) + cp $< $@ + CS1701-lib.dll : CS1701-lib.cs $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1701-lib.dll /out:$@ $< diff --git a/mcs/errors/cs1703-2.cs b/mcs/errors/cs1703-2.cs index 5269513cf80..783af2ca448 100644 --- a/mcs/errors/cs1703-2.cs +++ b/mcs/errors/cs1703-2.cs @@ -1,4 +1,3 @@ // CS1703: An assembly `System' with the same identity has already been imported. Consider removing one of the references // Line: 0 -// Compiler options: -r:../../external/binary-reference-assemblies/v2.0/System.dll - +// Compiler options: -r:dlls/cs1703-2/System.dll |