From 234daf1cf380a7766ddd9f5c40f3aac61fbc8a45 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 1 Mar 2019 15:03:26 -0500 Subject: [android] Fix Mono.Debugger.Soft tests with Android SDKs (#13218) * [android] Fix Mono.Debugger.Soft tests with Android SDKs * [android] Fix connecting with LLDB * [android] Add scaffolding to run profiler tests * [android] Fix some corlib tests * [android] Fix Mono.DebuggerTests.ExceptionFilter2 * [csproj] Update project files --- mcs/build/tests.make | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'mcs/build/tests.make') diff --git a/mcs/build/tests.make b/mcs/build/tests.make index e584563e280..65f2ff5b823 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -65,7 +65,19 @@ xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$ xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll) xunit_libs_ref += $(xunit_libs_dep:%=-r:%) -TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS) $(DEFAULT_REFERENCES)) +TEST_LIB_REFS_ALL = $(TEST_LIB_REFS) $(DEFAULT_REFERENCES) + +ifdef TARGET_NET_REFERENCE +# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir +TEST_LIB_REFS_MONO = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(TEST_LIB_REFS_ALL))) +TEST_LIB_REFS_SYSTEM = $(filter-out $(TEST_LIB_REFS_MONO),$(TEST_LIB_REFS_ALL)) + +TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(TEST_LIB_REFS_SYSTEM)) +TEST_LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(TEST_LIB_REFS_MONO)) +else +TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(TEST_LIB_REFS_ALL)) +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)%) -- cgit v1.2.3