[profiles] Fix MOBILE assemblies and tests compilation + Rename MOBILE to AOT_HYBRID

[mono.git] / mono / tests / Makefile.am

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index a80cd07e119941c41050adb154584ffb3bf9cad2..c36e42ade95de5ed3f173b57dd5f37b7be4972b5 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -50,6 +50,10 @@ if INSTALL_MOBILE_STATIC
 PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_STATIC,MOBILE_LEGACY 
 endif
 
+if INSTALL_AOT_HYBRID
+PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY 
+endif
+
 MCS_NO_LIB = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -debug \
        -noconfig -nologo \
        -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 \
@@ -835,6 +839,12 @@ PROFILE_DISABLED_TESTS += \
        bug-515884.exe
 endif
 
+if INSTALL_AOT_HYBRID
+PROFILE_DISABLED_TESTS += \
+       bug-80307.exe \
+       namedmutex-destroy-race.exe
+endif
+
 AOT_DISABLED_TESTS= \
        constraints-load.exe
 
@@ -906,8 +916,10 @@ EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \
        $(ILASM) -out:$@ $<
 
 if !INSTALL_MOBILE_STATIC
+if !INSTALL_AOT_HYBRID
 TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll
 endif
+endif
 
 if INSTALL_MOBILE_STATIC
 TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX)