diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-07-31 17:40:49 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-10-02 03:08:07 +0300 |
| commit | f782e36a80219e1fc810e5e4d9fd44b240563cf0 (patch) | |
| tree | a740f2098b030d611efc1e3bde586696a8272ebe /mcs/errors | |
| parent | a7d4c2a8b95bed2b31dad4bc52b85c7aa0cd3dd0 (diff) | |
[mcs] Fix test compilation to use common target
Add proper dependencies to the test support files where they were missing.
Compile test files using the standard "make test" target.
Diffstat (limited to 'mcs/errors')
| -rw-r--r-- | mcs/errors/Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile index 6a247725be3..d2303751690 100644 --- a/mcs/errors/Makefile +++ b/mcs/errors/Makefile @@ -47,14 +47,7 @@ ifdef VALID_PROFILE qcheck: run-mcs-tests -# again, run-test is when the tests actually happen, so -# don't compile on make test. - -test-local: - @: - -run-test-local: clean-local - $(MAKE) run-mcs-tests +run-test-local: test-local qcheck check: run-test-local @@ -67,7 +60,9 @@ TESTER_OPTIONS = -compiler-options:"-v --break-on-ice -d:NET_4_0;NET_4_5" 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) +test-local: $(TEST_SUPPORT_FILES) + +run-mcs-tests: test-local $(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 @@ -113,13 +108,13 @@ dlls/cs1703-2/System.dll: $(topdir)/../external/binary-reference-assemblies/v2.0 mkdir -p $(dir $@) cp $< $@ -CS1701-lib.dll : CS1701-lib.cs +CS1701-lib.dll : CS1701-lib.cs dlls/first/CS1701-lib.dll $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1701-lib.dll /out:$@ $< -CS1702-lib.dll : CS1702-lib.cs +CS1702-lib.dll : CS1702-lib.cs dlls/first/CS1702-lib.dll $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1702-lib.dll /out:$@ $< -CS1705-lib.dll : CS1705-lib.cs +CS1705-lib.dll : CS1705-lib.cs dlls/first/CS1705-lib.dll $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1705-lib.dll /out:$@ $< CSFriendAssembly-lib.dll : CSFriendAssembly-lib.cs |