From 5d054b1852f24b620e5800c06141201602e69d0e Mon Sep 17 00:00:00 2001
From: Alexander Kyte <alexmkyte@gmail.com>
Date: Mon, 6 Feb 2017 01:12:54 -0500
Subject: [PATCH] [runtime] Get mono/tests running on bitcode/arm (#4233)

---
 mono/tests/assemblyresolve/Makefile.am | 2 ++
 mono/tests/gc-descriptors/Makefile.am  | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/mono/tests/assemblyresolve/Makefile.am b/mono/tests/assemblyresolve/Makefile.am
index 54ff35c7b6c..1320b1c0752 100644
--- 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 a20e0e697d5..c73c06af676 100755
--- 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:
-- 
2.11.4.GIT