[runtime] Get mono/tests running on bitcode/arm (#4233)

diff --git a/mono/tests/assemblyresolve/Makefile.am b/mono/tests/assemblyresolve/Makefile.am
index 54ff35c7b6c39e47e01fba5424402f3793a9e360..1320b1c07524f380089d630355db893f0b632c55 100644 (file)
--- a/mono/tests/assemblyresolve/Makefile.am
+++ b/mono/tests/assemblyresolve/Makefile.am
@@ -2,6 +2,8 @@ CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
 
 RUNTIME = $(top_builddir)/runtime/mono-wrapper --debug
 TOOLS_RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/build $(RUNTIME)
+MCS = MONO_PATH=$(mcs_topdir)/class/lib/build $(RUNTIME) $(CSC) -noconfig -nologo -debug:portable -target:library
+CLASS = $(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
 
 MCS = $(TOOLS_RUNTIME) $(CSC) -noconfig -nologo -debug:portable -target:library
 

diff --git a/mono/tests/gc-descriptors/Makefile.am b/mono/tests/gc-descriptors/Makefile.am
index a20e0e697d59304f530b40e73d4fcbed3ffd2492..c73c06af676acda753ea2e35a3e7b926eda51f4a 100755 (executable)
--- a/mono/tests/gc-descriptors/Makefile.am
+++ b/mono/tests/gc-descriptors/Makefile.am
@@ -3,6 +3,12 @@ CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
 TOOLS_RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/build $(top_builddir)/runtime/mono-wrapper
 MCS = $(TOOLS_RUNTIME) $(CSC) -lib:$(CLASS) -noconfig -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219 -debug:portable
 
+if INSTALL_TESTING_AOT_FULL
+
+check-local:
+
+else
+
 check-local: test
 
 test : descriptor-tests.exe
@@ -14,6 +20,8 @@ descriptor-tests.cs : descriptor-tests-driver.cs descriptor-tests-prefix.cs gen-
        if [ "$(srcdir)" != "$(builddir)" ]; then cp $^ .; fi
        $(srcdir)/gen-descriptor-tests.py >descriptor-tests.cs
 
+endif
+
 EXTRA_DIST = descriptor-tests-driver.cs descriptor-tests-prefix.cs gen-descriptor-tests.py
 
 .DELETE_ON_ERROR: