From 342d23b74d8bd184584d00ef3336e399542ea31f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 20 Dec 2016 19:29:39 +0100 Subject: [PATCH] [bcl] Rename aot_hybrid profile to testing_aot_hybrid --- configure.ac | 40 ++++++++-------- mcs/Makefile | 4 +- ...ot_hybrid.make => testing_aot_hybrid.make} | 0 mcs/class/Makefile | 6 +-- ...ting_aot_hybrid_Mono.Security.dll.sources} | 0 ...esting_aot_hybrid_System.Core.dll.sources} | 0 .../System.Data/app_test_aot_hybrid.config | 48 ------------------- ...esting_aot_hybrid_System.Data.dll.sources} | 0 ...brid_System.Data_test.dll.exclude.sources} | 0 ...t_hybrid_System.IdentityModel.dll.sources} | 0 ..._System.Runtime.Serialization.dll.sources} | 0 ...System.ServiceModel.Internals.dll.sources} | 0 ...ybrid_System.ServiceModel.Web.dll.sources} | 0 ...ot_hybrid_System.ServiceModel.dll.sources} | 0 ...tem.ServiceModel_test.dll.exclude.sources} | 0 ...ot_hybrid_System.Web.Services.dll.sources} | 0 ...tem.Web.Services_test.dll.exclude.sources} | 0 ...testing_aot_hybrid_System.Xml.dll.sources} | 0 ... => testing_aot_hybrid_System.dll.sources} | 0 ...ot_hybrid_System_test.dll.exclude.sources} | 0 mcs/class/corlib/Makefile | 2 +- ...ot_hybrid_corlib_test.dll.exclude.sources} | 0 mono/tests/Makefile.am | 6 +-- runtime/Makefile.am | 4 +- ...brid.sh => run-test-testing_aot_hybrid.sh} | 0 25 files changed, 31 insertions(+), 79 deletions(-) rename mcs/build/profiles/{aot_hybrid.make => testing_aot_hybrid.make} (100%) rename mcs/class/Mono.Security/{aot_hybrid_Mono.Security.dll.sources => testing_aot_hybrid_Mono.Security.dll.sources} (100%) rename mcs/class/System.Core/{aot_hybrid_System.Core.dll.sources => testing_aot_hybrid_System.Core.dll.sources} (100%) delete mode 100644 mcs/class/System.Data/app_test_aot_hybrid.config rename mcs/class/System.Data/{aot_hybrid_System.Data.dll.sources => testing_aot_hybrid_System.Data.dll.sources} (100%) rename mcs/class/System.Data/{aot_hybrid_System.Data_test.dll.exclude.sources => testing_aot_hybrid_System.Data_test.dll.exclude.sources} (100%) rename mcs/class/System.IdentityModel/{aot_hybrid_System.IdentityModel.dll.sources => testing_aot_hybrid_System.IdentityModel.dll.sources} (100%) rename mcs/class/System.Runtime.Serialization/{aot_hybrid_System.Runtime.Serialization.dll.sources => testing_aot_hybrid_System.Runtime.Serialization.dll.sources} (100%) rename mcs/class/System.ServiceModel.Internals/{aot_hybrid_System.ServiceModel.Internals.dll.sources => testing_aot_hybrid_System.ServiceModel.Internals.dll.sources} (100%) rename mcs/class/System.ServiceModel.Web/{aot_hybrid_System.ServiceModel.Web.dll.sources => testing_aot_hybrid_System.ServiceModel.Web.dll.sources} (100%) rename mcs/class/System.ServiceModel/{aot_hybrid_System.ServiceModel.dll.sources => testing_aot_hybrid_System.ServiceModel.dll.sources} (100%) rename mcs/class/System.ServiceModel/{aot_hybrid_System.ServiceModel_test.dll.exclude.sources => testing_aot_hybrid_System.ServiceModel_test.dll.exclude.sources} (100%) rename mcs/class/System.Web.Services/{aot_hybrid_System.Web.Services.dll.sources => testing_aot_hybrid_System.Web.Services.dll.sources} (100%) rename mcs/class/System.Web.Services/{aot_hybrid_System.Web.Services_test.dll.exclude.sources => testing_aot_hybrid_System.Web.Services_test.dll.exclude.sources} (100%) rename mcs/class/System.XML/{aot_hybrid_System.Xml.dll.sources => testing_aot_hybrid_System.Xml.dll.sources} (100%) rename mcs/class/System/{aot_hybrid_System.dll.sources => testing_aot_hybrid_System.dll.sources} (100%) rename mcs/class/System/{aot_hybrid_System_test.dll.exclude.sources => testing_aot_hybrid_System_test.dll.exclude.sources} (100%) rename mcs/class/corlib/{aot_hybrid_corlib_test.dll.exclude.sources => testing_aot_hybrid_corlib_test.dll.exclude.sources} (100%) rename scripts/ci/{run-test-aot_hybrid.sh => run-test-testing_aot_hybrid.sh} (100%) diff --git a/configure.ac b/configure.ac index 059bcff7bf1..2b5424a8a66 100644 --- a/configure.ac +++ b/configure.ac @@ -793,16 +793,16 @@ AC_MSG_RESULT($csc_compiler) # Set the build profiles and options before things which use them # -AC_ARG_WITH(profile4_x, [ --with-profile4_x=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4_x=default]) -AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=default]) -AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=default]) -AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to build the Xamarin.WatchOS assemblies (defaults to no)],[], [with_monotouch_watch=default]) -AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=default]) -AC_ARG_WITH(bitcode, [ --with-bitcode=yes,no If bitcode is enabled (defaults to no)], [], [with_bitcode=default]) -AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=default]) -AC_ARG_WITH(aot_hybrid, [ --with-aot_hybrid=yes,no If you want to build the aot_hybrid assemblies (defaults to no)], [], [with_aot_hybrid=default]) -AC_ARG_WITH(testing_aot_full,[ --with-testing_aot_full=yes,no If you want to build the testing_aot_full assemblies (defaults to no)],[], [with_testing_aot_full=default]) -AC_ARG_WITH(xbox, [ --with-xbox=yes,no If you want to build the Xbox assemblies (defaults to no)], [], [with_xbox=default]) +AC_ARG_WITH(profile4_x, [ --with-profile4_x=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4_x=default]) +AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=default]) +AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=default]) +AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to build the Xamarin.WatchOS assemblies (defaults to no)], [], [with_monotouch_watch=default]) +AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=default]) +AC_ARG_WITH(bitcode, [ --with-bitcode=yes,no If bitcode is enabled (defaults to no)], [], [with_bitcode=default]) +AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=default]) +AC_ARG_WITH(testing_aot_hybrid, [ --with-testing_aot_hybrid=yes,no If you want to build the testing_aot_hybrid assemblies (defaults to no)], [], [with_testing_aot_hybrid=default]) +AC_ARG_WITH(testing_aot_full, [ --with-testing_aot_full=yes,no If you want to build the testing_aot_full assemblies (defaults to no)], [], [with_testing_aot_full=default]) +AC_ARG_WITH(xbox, [ --with-xbox=yes,no If you want to build the Xbox assemblies (defaults to no)], [], [with_xbox=default]) AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot,hybridaot,fullaot,bitcode Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x]) @@ -818,7 +818,7 @@ with_monotouch_default=no with_monotouch_watch_default=no with_monotouch_tv_default=no with_xammac_default=no -with_aot_hybrid_default=no +with_testing_aot_hybrid_default=no with_testing_aot_full_default=no with_xbox_default=no @@ -869,8 +869,8 @@ elif test x$with_runtime_preset = xbitcode; then AOT_RUN_FLAGS="--llvmonly" elif test x$with_runtime_preset = xhybridaot; then DISABLE_MCS_DOCS_default=yes - with_aot_hybrid_default=yes - TEST_PROFILE=aot_hybrid + with_testing_aot_hybrid_default=yes + TEST_PROFILE=testing_aot_hybrid mono_feature_disable_com='yes' mono_feature_disable_remoting='yes' @@ -919,8 +919,8 @@ fi if test "x$with_xammac" = "xdefault"; then with_xammac=$with_xammac_default fi -if test "x$with_aot_hybrid" = "xdefault"; then - with_aot_hybrid=$with_aot_hybrid_default +if test "x$with_testing_aot_hybrid" = "xdefault"; then + with_testing_aot_hybrid=$with_testing_aot_hybrid_default fi if test "x$with_testing_aot_full" = "xdefault"; then with_testing_aot_full=$with_testing_aot_full_default @@ -937,10 +937,10 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"] AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"]) AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes") AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"]) -AM_CONDITIONAL(INSTALL_AOT_HYBRID, [test "x$with_aot_hybrid" != "xno"]) +AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" != "xno"]) AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"]) -AC_SUBST(INSTALL_AOT_HYBRID) +AC_SUBST(INSTALL_TESTING_AOT_HYBRID) AC_SUBST(INSTALL_TESTING_AOT_FULL) default_profile=net_4_x @@ -953,8 +953,8 @@ fi if test -z "$INSTALL_XAMMAC_TRUE"; then : default_profile=xammac fi -if test -z "$INSTALL_AOT_HYBRID_TRUE"; then : - default_profile=aot_hybrid +if test -z "$INSTALL_TESTING_AOT_HYBRID_TRUE"; then : + default_profile=testing_aot_hybrid fi if test -z "$INSTALL_TESTING_AOT_FULL_TRUE"; then : default_profile=testing_aot_full @@ -4499,7 +4499,7 @@ echo " Xamarin.WatchOS: $with_monotouch_watch Xamarin.TVOS: $with_monotouch_tv Xamarin.Mac: $with_xammac - AOT Hybrid: $with_aot_hybrid + AOT Hybrid: $with_testing_aot_hybrid AOT Full: $with_testing_aot_full JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg diff --git a/mcs/Makefile b/mcs/Makefile index 14b5121e0a1..cba9589ad08 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -14,7 +14,7 @@ monotouch_runtime_SUBDIRS := build class monotouch_watch_runtime_SUBDIRS := build class monotouch_tv_runtime_SUBDIRS := build class xammac_SUBDIRS := build class -aot_hybrid_SUBDIRS := build class +testing_aot_hybrid_SUBDIRS := build class testing_aot_full_SUBDIRS := build class binary_reference_assemblies_SUBDIRS := build class net_4_x_SUBDIRS := build class nunit24 ilasm tools tests errors docs mcs class/aot-compiler packages @@ -72,7 +72,7 @@ $(_boot_:%=profile-do--monotouch_watch_runtime--%): profile-do--monotouch_watch $(_boot_:%=profile-do--monotouch_tv_runtime--%): profile-do--monotouch_tv_runtime--%: profile-do--build--% $(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--% $(_boot_:%=profile-do--xammac_net_4_5--%): profile-do--xammac_net_4_5--%: profile-do--build--% -$(_boot_:%=profile-do--aot_hybrid--%): profile-do--aot_hybrid--%: profile-do--build--% +$(_boot_:%=profile-do--testing_aot_hybrid--%): profile-do--testing_aot_hybrid--%: profile-do--build--% $(_boot_:%=profile-do--testing_aot_full--%): profile-do--testing_aot_full--%: profile-do--build--% $(_boot_:%=profile-do--xbox--%): profile-do--xbox--%: profile-do--build--% $(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--% diff --git a/mcs/build/profiles/aot_hybrid.make b/mcs/build/profiles/testing_aot_hybrid.make similarity index 100% rename from mcs/build/profiles/aot_hybrid.make rename to mcs/build/profiles/testing_aot_hybrid.make diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 4bcc3f696b6..33c8b27cb0b 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -89,7 +89,7 @@ testing_aot_full_dirs := \ Mono.Simd \ $(pcl_facade_dirs) -aot_hybrid_dirs := \ +testing_aot_hybrid_dirs := \ $(mobile_common_dirs) \ Mono.CompilerServices.SymbolWriter \ Mono.Simd \ @@ -335,7 +335,7 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs) monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs) monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs) testing_aot_full_SUBDIRS := $(testing_aot_full_dirs) -aot_hybrid_SUBDIRS := $(aot_hybrid_dirs) +testing_aot_hybrid_SUBDIRS := $(testing_aot_hybrid_dirs) xammac_SUBDIRS := $(xammac_dirs) xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs) binary_reference_assemblies_SUBDIRS := reference-assemblies @@ -347,7 +347,7 @@ xbox_SUBDIRS := $(xbox_dirs) include ../build/rules.make -SUBDIRS = $(testing_aot_full_dirs) $(aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) +SUBDIRS = $(testing_aot_full_dirs) $(testing_aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks diff --git a/mcs/class/Mono.Security/aot_hybrid_Mono.Security.dll.sources b/mcs/class/Mono.Security/testing_aot_hybrid_Mono.Security.dll.sources similarity index 100% rename from mcs/class/Mono.Security/aot_hybrid_Mono.Security.dll.sources rename to mcs/class/Mono.Security/testing_aot_hybrid_Mono.Security.dll.sources diff --git a/mcs/class/System.Core/aot_hybrid_System.Core.dll.sources b/mcs/class/System.Core/testing_aot_hybrid_System.Core.dll.sources similarity index 100% rename from mcs/class/System.Core/aot_hybrid_System.Core.dll.sources rename to mcs/class/System.Core/testing_aot_hybrid_System.Core.dll.sources diff --git a/mcs/class/System.Data/app_test_aot_hybrid.config b/mcs/class/System.Data/app_test_aot_hybrid.config deleted file mode 100644 index 4f315973f1e..00000000000 --- a/mcs/class/System.Data/app_test_aot_hybrid.config +++ /dev/null @@ -1,48 +0,0 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - diff --git a/mcs/class/System.Data/aot_hybrid_System.Data.dll.sources b/mcs/class/System.Data/testing_aot_hybrid_System.Data.dll.sources similarity index 100% rename from mcs/class/System.Data/aot_hybrid_System.Data.dll.sources rename to mcs/class/System.Data/testing_aot_hybrid_System.Data.dll.sources diff --git a/mcs/class/System.Data/aot_hybrid_System.Data_test.dll.exclude.sources b/mcs/class/System.Data/testing_aot_hybrid_System.Data_test.dll.exclude.sources similarity index 100% rename from mcs/class/System.Data/aot_hybrid_System.Data_test.dll.exclude.sources rename to mcs/class/System.Data/testing_aot_hybrid_System.Data_test.dll.exclude.sources diff --git a/mcs/class/System.IdentityModel/aot_hybrid_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/testing_aot_hybrid_System.IdentityModel.dll.sources similarity index 100% rename from mcs/class/System.IdentityModel/aot_hybrid_System.IdentityModel.dll.sources rename to mcs/class/System.IdentityModel/testing_aot_hybrid_System.IdentityModel.dll.sources diff --git a/mcs/class/System.Runtime.Serialization/aot_hybrid_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/testing_aot_hybrid_System.Runtime.Serialization.dll.sources similarity index 100% rename from mcs/class/System.Runtime.Serialization/aot_hybrid_System.Runtime.Serialization.dll.sources rename to mcs/class/System.Runtime.Serialization/testing_aot_hybrid_System.Runtime.Serialization.dll.sources diff --git a/mcs/class/System.ServiceModel.Internals/aot_hybrid_System.ServiceModel.Internals.dll.sources b/mcs/class/System.ServiceModel.Internals/testing_aot_hybrid_System.ServiceModel.Internals.dll.sources similarity index 100% rename from mcs/class/System.ServiceModel.Internals/aot_hybrid_System.ServiceModel.Internals.dll.sources rename to mcs/class/System.ServiceModel.Internals/testing_aot_hybrid_System.ServiceModel.Internals.dll.sources diff --git a/mcs/class/System.ServiceModel.Web/aot_hybrid_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/testing_aot_hybrid_System.ServiceModel.Web.dll.sources similarity index 100% rename from mcs/class/System.ServiceModel.Web/aot_hybrid_System.ServiceModel.Web.dll.sources rename to mcs/class/System.ServiceModel.Web/testing_aot_hybrid_System.ServiceModel.Web.dll.sources diff --git a/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/testing_aot_hybrid_System.ServiceModel.dll.sources similarity index 100% rename from mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel.dll.sources rename to mcs/class/System.ServiceModel/testing_aot_hybrid_System.ServiceModel.dll.sources diff --git a/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel_test.dll.exclude.sources b/mcs/class/System.ServiceModel/testing_aot_hybrid_System.ServiceModel_test.dll.exclude.sources similarity index 100% rename from mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel_test.dll.exclude.sources rename to mcs/class/System.ServiceModel/testing_aot_hybrid_System.ServiceModel_test.dll.exclude.sources diff --git a/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/testing_aot_hybrid_System.Web.Services.dll.sources similarity index 100% rename from mcs/class/System.Web.Services/aot_hybrid_System.Web.Services.dll.sources rename to mcs/class/System.Web.Services/testing_aot_hybrid_System.Web.Services.dll.sources diff --git a/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/testing_aot_hybrid_System.Web.Services_test.dll.exclude.sources similarity index 100% rename from mcs/class/System.Web.Services/aot_hybrid_System.Web.Services_test.dll.exclude.sources rename to mcs/class/System.Web.Services/testing_aot_hybrid_System.Web.Services_test.dll.exclude.sources diff --git a/mcs/class/System.XML/aot_hybrid_System.Xml.dll.sources b/mcs/class/System.XML/testing_aot_hybrid_System.Xml.dll.sources similarity index 100% rename from mcs/class/System.XML/aot_hybrid_System.Xml.dll.sources rename to mcs/class/System.XML/testing_aot_hybrid_System.Xml.dll.sources diff --git a/mcs/class/System/aot_hybrid_System.dll.sources b/mcs/class/System/testing_aot_hybrid_System.dll.sources similarity index 100% rename from mcs/class/System/aot_hybrid_System.dll.sources rename to mcs/class/System/testing_aot_hybrid_System.dll.sources diff --git a/mcs/class/System/aot_hybrid_System_test.dll.exclude.sources b/mcs/class/System/testing_aot_hybrid_System_test.dll.exclude.sources similarity index 100% rename from mcs/class/System/aot_hybrid_System_test.dll.exclude.sources rename to mcs/class/System/testing_aot_hybrid_System_test.dll.exclude.sources diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 48de228a0b0..4d40d337125 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -68,7 +68,7 @@ DEFAULT_REFERENCES = TEST_LIB_REFS = System.Core System ifndef AOT_FRIENDLY_PROFILE -ifneq ($(PROFILE),aot_hybrid) +ifneq ($(PROFILE),testing_aot_hybrid) TEST_LIB_REFS += Mono.Posix endif endif diff --git a/mcs/class/corlib/aot_hybrid_corlib_test.dll.exclude.sources b/mcs/class/corlib/testing_aot_hybrid_corlib_test.dll.exclude.sources similarity index 100% rename from mcs/class/corlib/aot_hybrid_corlib_test.dll.exclude.sources rename to mcs/class/corlib/testing_aot_hybrid_corlib_test.dll.exclude.sources diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index 3be63e5db1b..7e75e4f2d29 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -50,7 +50,7 @@ if INSTALL_TESTING_AOT_FULL PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY,FULL_AOT_DESKTOP endif -if INSTALL_AOT_HYBRID +if INSTALL_TESTING_AOT_HYBRID PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY endif @@ -840,7 +840,7 @@ PROFILE_DISABLED_TESTS += \ bug-515884.exe endif -if INSTALL_AOT_HYBRID +if INSTALL_TESTING_AOT_HYBRID PROFILE_DISABLED_TESTS += \ bug-80307.exe \ namedmutex-destroy-race.exe @@ -923,7 +923,7 @@ EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \ $(ILASM) -out:$@ $< if !INSTALL_TESTING_AOT_FULL -if !INSTALL_AOT_HYBRID +if !INSTALL_TESTING_AOT_HYBRID TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll endif endif diff --git a/runtime/Makefile.am b/runtime/Makefile.am index d9fcbdac16b..fa969c3c958 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -48,8 +48,8 @@ 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_TESTING_AOT_FULL diff --git a/scripts/ci/run-test-aot_hybrid.sh b/scripts/ci/run-test-testing_aot_hybrid.sh similarity index 100% rename from scripts/ci/run-test-aot_hybrid.sh rename to scripts/ci/run-test-testing_aot_hybrid.sh -- 2.25.1