diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-04-02 22:41:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 22:41:43 +0300 |
| commit | 02946b7cedb79c01da04d200564d864a17659d42 (patch) | |
| tree | 638f74ac3cdb8a86e7905c2e89ae773a7a2bb86b /mcs/build | |
| parent | 688ac23fb69edb61995369d162b90b1bfc73ebb3 (diff) | |
[bcl] Fix compiling nunitlite when PARENT_PROFILE is defined (#13791)
In this case we relied on nunitlite to be compiled when the parent profile is compiled. That doesn't work however if we compile the child profile first (e.g. during a parallel make) since it'll
complain about missing nunitlite.dll.
We now compile nunitlite in the child profiles too even though we don't use it.
This is an alternative solution to what I tried in https://github.com/mono/mono/pull/5357 since I couldn't get it to work and this should be the easier fix.
It allows us to finally remove the `-i` (ignore errors) from the CI scripts and catch test assembly breakages in mobile profiles which we ignored before.
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/tests.make | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mcs/build/tests.make b/mcs/build/tests.make index 428baada657..7975901bc2c 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -62,7 +62,7 @@ xunit_class_deps := xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core)) xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$(xunit_deps)) -xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll) +xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/%.dll) xunit_libs_ref += $(xunit_libs_dep:%=-r:%) TEST_LIB_REFS_ALL = $(TEST_LIB_REFS) $(DEFAULT_REFERENCES) @@ -80,7 +80,7 @@ endif XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS) $(DEFAULT_REFERENCES)) -test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%) +test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%) test_nunit_ref = $(test_nunit_dep:%=-r:%) tests_CLEAN_FILES += TestResult*.xml @@ -132,9 +132,7 @@ $(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp @if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi $(topdir)/build/deps/nunit-$(PROFILE).stamp: -ifndef PARENT_PROFILE cd ${topdir}/tools/nunit-lite && $(MAKE) -endif echo "stamp" >$@ tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp |