diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-10-18 14:06:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 14:06:27 +0300 |
| commit | d07ddffffe464f0a92cd013192eba2067ff4794b (patch) | |
| tree | 55e7e20a1c5847b42b9354102040ff109bef099e /mcs/class/Mono.Debugger.Soft | |
| parent | 660ca3bc7094f8418590ba08d1c77c2e6472d50b (diff) | |
[Mono.Debugger.Soft] Simplify building dtest-app.exe for monodroid profile (#11229)
We only build it if we're explicitly building the monodroid profile and for the
monodroid_tools profile we only build the test assembly but not dtest-app.exe
Diffstat (limited to 'mcs/class/Mono.Debugger.Soft')
| -rw-r--r-- | mcs/class/Mono.Debugger.Soft/Makefile | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile index 7c2203aaeb0..c8a1848343d 100644 --- a/mcs/class/Mono.Debugger.Soft/Makefile +++ b/mcs/class/Mono.Debugger.Soft/Makefile @@ -8,20 +8,9 @@ LIB_REFS = System Mono.Cecil System.Core LIB_MCS_FLAGS = /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS /publicsign KEYFILE = $(LIBRARY_SNK) -# special case monodroid_tools since it doesn't contain mscorlib etc but we need to compile the tests against something -# and want dtest-app.exe etc to end up in the monodroid profile -ifeq ($(PROFILE), monodroid_tools) -TEST_MCS_FLAGS = -d:MONODROID_TEST -DEFAULT_REFERENCES = -LIB_REFS += mscorlib -dtest_profile = monodroid -TEST_LIB_REFS = Mono.Cecil ../$(dtest_profile)/mscorlib ../$(dtest_profile)/System ../$(dtest_profile)/System.Core -else TEST_LIB_REFS = Mono.Cecil System System.Core -dtest_profile = $(PROFILE) -endif -VALID_TEST_PROFILE := $(filter net_4_x monodroid_tools, $(PROFILE)) +VALID_TEST_PROFILE := $(filter net_4_x, $(PROFILE)) ifdef VALID_TEST_PROFILE @@ -34,7 +23,7 @@ check: endif -test_output_dir=$(topdir)/class/lib/$(dtest_profile)/tests +test_output_dir=$(topdir)/class/lib/$(PROFILE)/tests $(test_output_dir): mkdir -p $@ @@ -45,7 +34,7 @@ $(test_output_dir)/dtest-excfilter.exe: Test/dtest-excfilter.il | $(test_output_ $(ILASM) -out:$@ /exe /debug Test/dtest-excfilter.il $(test_output_dir)/dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES) | $(test_output_dir) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(dtest_profile)/mscorlib.dll -r:$(topdir)/class/lib/$(dtest_profile)/System.Core.dll -r:$(topdir)/class/lib/$(dtest_profile)/System.dll -sourcelink:Test/sourcelink.json -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -sourcelink:Test/sourcelink.json -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) TEST_HELPERS_SOURCES = \ ../test-helpers/NetworkHelpers.cs \ |