Don't try to AOT test assemblies in runtime_preset=all (#4303)

[mono.git] / runtime / Makefile.am

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 5224c91837ff9bb9dd665d43987db121b7285be7..b540ee13f009dc7877f26c120cb2169ad3430e42 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -48,18 +48,26 @@ if INSTALL_MONOTOUCH_TV
 build_profiles += monotouch_tv monotouch_tv_runtime
 endif
 
-if INSTALL_AOT_HYBRID
-build_profiles += aot_hybrid
+if INSTALL_TESTING_AOT_HYBRID
+build_profiles += testing_aot_hybrid
 endif
 
-if INSTALL_AOT_ONLY
-build_profiles += aot_only
+if INSTALL_TESTING_AOT_FULL
+build_profiles += testing_aot_full
+endif
+
+if INSTALL_WINAOT
+build_profiles += winaot
 endif
 
 if INSTALL_XAMMAC
 build_profiles += xammac xammac_net_4_5
 endif
 
+if INSTALL_ORBIS
+build_profiles += orbis
+endif
+
 test_profiles = $(build_profiles)
 
 if BUILD_MCS
@@ -113,20 +121,20 @@ cur_dir_cmd = pwd
 PLATFORM_PATH_SEPARATOR = :
 endif
 
-if INSTALL_AOT_ONLY
-#  ILASM.exe has features which a aot_only runtime will not support.
+if FULL_AOT_TESTS
+#  ILASM.exe has features which a testing_aot_full runtime will not support.
 #  It is invoked with an external mono when used in the runtime.
 #  We skip it here because otherwise it will fail to verify.
-AOT_ONLY_FILTER=grep -v ilasm
+FULL_AOT_TESTS_FILTER=grep -v ilasm
 else
-AOT_ONLY_FILTER=echo
+FULL_AOT_TESTS_FILTER=echo
 endif
 
 # Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
 # TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
 # Skip binary_reference_assemblies because they contain metadata only
 mcs-compileall: mono-wrapper etc/mono/config
-       export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(AOT_ONLY_FILTER)` ; \
+       export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(FULL_AOT_TESTS_FILTER)` ; \
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(test_profiles); do \
          if [ "binary_reference_assemblies" = "$$profile" ]; then \