diff options
50 files changed, 78 insertions, 78 deletions
diff --git a/configure.ac b/configure.ac index 9d15bceb49b..059bcff7bf1 100644 --- a/configure.ac +++ b/configure.ac @@ -801,7 +801,7 @@ AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to b 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(aot_only, [ --with-aot_only=yes,no If you want to build the aot_only assemblies (defaults to no)], [], [with_aot_only=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]) @@ -819,7 +819,7 @@ with_monotouch_watch_default=no with_monotouch_tv_default=no with_xammac_default=no with_aot_hybrid_default=no -with_aot_only_default=no +with_testing_aot_full_default=no with_xbox_default=no with_bitcode_default=no @@ -840,8 +840,8 @@ elif test x$with_runtime_preset = xall; then with_xammac_default=yes elif test x$with_runtime_preset = xfullaot; then DISABLE_MCS_DOCS_default=yes - with_aot_only_default=yes - TEST_PROFILE=aot_only + with_testing_aot_full_default=yes + TEST_PROFILE=testing_aot_full mono_feature_disable_com='yes' mono_feature_disable_remoting='yes' @@ -853,10 +853,10 @@ elif test x$with_runtime_preset = xfullaot; then AOT_RUN_FLAGS="--full-aot" elif test x$with_runtime_preset = xbitcode; then DISABLE_MCS_DOCS_default=yes - with_aot_only_default=yes + with_testing_aot_full_default=yes with_bitcode_default=yes with_cooperative_gc_default=yes - TEST_PROFILE=aot_only + TEST_PROFILE=testing_aot_full enable_llvm_default=yes mono_feature_disable_com='yes' @@ -922,8 +922,8 @@ fi if test "x$with_aot_hybrid" = "xdefault"; then with_aot_hybrid=$with_aot_hybrid_default fi -if test "x$with_aot_only" = "xdefault"; then - with_aot_only=$with_aot_only_default +if test "x$with_testing_aot_full" = "xdefault"; then + with_testing_aot_full=$with_testing_aot_full_default fi if test "x$with_xbox" = "xdefault"; then with_xbox=$with_xbox_default @@ -938,10 +938,10 @@ 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_AOT_ONLY, [test "x$with_aot_only" != "xno"]) +AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"]) AC_SUBST(INSTALL_AOT_HYBRID) -AC_SUBST(INSTALL_AOT_ONLY) +AC_SUBST(INSTALL_TESTING_AOT_FULL) default_profile=net_4_x if test -z "$INSTALL_MONODROID_TRUE"; then : @@ -956,8 +956,8 @@ fi if test -z "$INSTALL_AOT_HYBRID_TRUE"; then : default_profile=aot_hybrid fi -if test -z "$INSTALL_AOT_ONLY_TRUE"; then : - default_profile=aot_only +if test -z "$INSTALL_TESTING_AOT_FULL_TRUE"; then : + default_profile=testing_aot_full fi if test -z "$INSTALL_4_x_TRUE"; then : default_profile=net_4_x @@ -4499,8 +4499,8 @@ echo " Xamarin.WatchOS: $with_monotouch_watch Xamarin.TVOS: $with_monotouch_tv Xamarin.Mac: $with_xammac - AOT preferred: $with_aot_hybrid - AOT only: $with_aot_only + AOT Hybrid: $with_aot_hybrid + AOT Full: $with_testing_aot_full JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg diff --git a/mcs/Makefile b/mcs/Makefile index af01ee0a600..14b5121e0a1 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -15,7 +15,7 @@ monotouch_watch_runtime_SUBDIRS := build class monotouch_tv_runtime_SUBDIRS := build class xammac_SUBDIRS := build class aot_hybrid_SUBDIRS := build class -aot_only_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 xammac_net_4_5_SUBDIRS := build class @@ -73,7 +73,7 @@ $(_boot_:%=profile-do--monotouch_tv_runtime--%): profile-do--monotouch_tv_ru $(_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--aot_only--%): profile-do--aot_only--%: 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_only.make b/mcs/build/profiles/testing_aot_full.make index ba50e26cb51..41c8ac0e144 100644 --- a/mcs/build/profiles/aot_only.make +++ b/mcs/build/profiles/testing_aot_full.make @@ -23,7 +23,7 @@ PROFILE_MCS_FLAGS = \ -d:MONO \ -d:NETSTANDARD \ -d:MOBILE,MOBILE_LEGACY \ - -d:AOT_ONLY_DESKTOP \ + -d:FULL_AOT_DESKTOP \ -d:FULL_AOT_RUNTIME \ -d:DISABLE_REMOTING \ -d:DISABLE_COM \ diff --git a/mcs/build/profiles/xbox.make b/mcs/build/profiles/xbox.make index ecfe02c86b3..edd9f4e2104 100644 --- a/mcs/build/profiles/xbox.make +++ b/mcs/build/profiles/xbox.make @@ -23,7 +23,7 @@ PROFILE_MCS_FLAGS = \ -d:MONO \ -d:NETSTANDARD \ -d:MOBILE,MOBILE_LEGACY \ - -d:AOT_ONLY_DESKTOP \ + -d:FULL_AOT_DESKTOP \ -d:FULL_AOT_RUNTIME \ -d:DISABLE_REMOTING \ -d:DISABLE_COM \ diff --git a/mcs/build/rules.make b/mcs/build/rules.make index 3f58bcc3c2c..7dd7b60b5e4 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -140,7 +140,7 @@ endif # For this to be done safely, we really need two passes. This # ensures that all of the .dlls are compiled before trying to # aot them. Because we want this to be the -# default target for some profiles(aot_only) we have a +# default target for some profiles(testing_aot_full) we have a # two-level build system. The do-all-aot target is what # gets invoked at the top-level when someone tries to build with aot. # It will invoke the do-all target, and will set TOP_LEVEL_DO for this diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index 5e59fcb2206..e0727b72168 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -38,8 +38,8 @@ drawing_DEPS_SUBDIRS = System.Drawing.Primitives monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) -aot_only_SUBDIRS = $(monotouch_SUBDIRS) -aot_only_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) +testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS) +testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(drawing_DEPS_SUBDIRS) net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS) diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 6d38b0ca55a..4bcc3f696b6 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -83,7 +83,7 @@ mobile_common_dirs := \ System.Reflection.Context \ System.Net.Http.WinHttpHandler -aot_only_dirs := \ +testing_aot_full_dirs := \ $(mobile_common_dirs) \ Mono.CompilerServices.SymbolWriter \ Mono.Simd \ @@ -107,7 +107,7 @@ monodroid_dirs := \ $(pcl_facade_dirs) monotouch_dirs := \ - $(aot_only_dirs) + $(testing_aot_full_dirs) monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs)) monotouch_tv_dirs := $(monotouch_dirs) @@ -334,7 +334,7 @@ monotouch_tv_SUBDIRS := $(monotouch_tv_dirs) monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs) monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs) monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs) -aot_only_SUBDIRS := $(aot_only_dirs) +testing_aot_full_SUBDIRS := $(testing_aot_full_dirs) aot_hybrid_SUBDIRS := $(aot_hybrid_dirs) xammac_SUBDIRS := $(xammac_dirs) xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs) @@ -347,7 +347,7 @@ xbox_SUBDIRS := $(xbox_dirs) include ../build/rules.make -SUBDIRS = $(aot_only_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) $(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.CSharp/monotouch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources index d2f37605a4d..083e61afd3f 100644 --- a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources +++ b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources @@ -1 +1 @@ -#include aot_only_Mono.CSharp.dll.sources +#include testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources index d2f37605a4d..083e61afd3f 100644 --- a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources +++ b/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources @@ -1 +1 @@ -#include aot_only_Mono.CSharp.dll.sources +#include testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources index d2f37605a4d..083e61afd3f 100644 --- a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources +++ b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources @@ -1 +1 @@ -#include aot_only_Mono.CSharp.dll.sources +#include testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources index 4c30fc6e148..4c30fc6e148 100644 --- a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp.dll.sources +++ b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources diff --git a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.exclude.sources b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp_test.dll.exclude.sources index c433add3996..c433add3996 100644 --- a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.exclude.sources +++ b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp_test.dll.exclude.sources diff --git a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.sources b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp_test.dll.sources index 64b774be65d..64b774be65d 100644 --- a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.sources +++ b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp_test.dll.sources diff --git a/mcs/class/Mono.Security/aot_only_Mono.Security.dll.sources b/mcs/class/Mono.Security/testing_aot_full_Mono.Security.dll.sources index 87eaa009cd8..87eaa009cd8 100644 --- a/mcs/class/Mono.Security/aot_only_Mono.Security.dll.sources +++ b/mcs/class/Mono.Security/testing_aot_full_Mono.Security.dll.sources diff --git a/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources b/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources index 65a50af7238..05e6552db87 100644 --- a/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources +++ b/mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources @@ -1,2 +1,2 @@ -#include aot_only_System.Core_test.dll.exclude.sources +#include testing_aot_full_System.Core_test.dll.exclude.sources #include monodroid_System.Core_test.dll.new-exclude.sources diff --git a/mcs/class/System.Core/aot_only_System.Core.dll.sources b/mcs/class/System.Core/testing_aot_full_System.Core.dll.sources index 8b8fef0e40e..8b8fef0e40e 100644 --- a/mcs/class/System.Core/aot_only_System.Core.dll.sources +++ b/mcs/class/System.Core/testing_aot_full_System.Core.dll.sources diff --git a/mcs/class/System.Core/aot_only_System.Core_test.dll.exclude.sources b/mcs/class/System.Core/testing_aot_full_System.Core_test.dll.exclude.sources index f98bf051bef..f98bf051bef 100644 --- a/mcs/class/System.Core/aot_only_System.Core_test.dll.exclude.sources +++ b/mcs/class/System.Core/testing_aot_full_System.Core_test.dll.exclude.sources diff --git a/mcs/class/System.Core/aot_only_System.Core_test.dll.sources b/mcs/class/System.Core/testing_aot_full_System.Core_test.dll.sources index 33e2a105847..33e2a105847 100644 --- a/mcs/class/System.Core/aot_only_System.Core_test.dll.sources +++ b/mcs/class/System.Core/testing_aot_full_System.Core_test.dll.sources diff --git a/mcs/class/System.Core/xbox_System.Core.dll.sources b/mcs/class/System.Core/xbox_System.Core.dll.sources index c936fccb6d1..a7b1796f147 100644 --- a/mcs/class/System.Core/xbox_System.Core.dll.sources +++ b/mcs/class/System.Core/xbox_System.Core.dll.sources @@ -1 +1 @@ -#include aot_only_System.Core.dll.sources
\ No newline at end of file +#include testing_aot_full_System.Core.dll.sources diff --git a/mcs/class/System.Data/aot_only_System.Data.dll.sources b/mcs/class/System.Data/testing_aot_full_System.Data.dll.sources index bbc860b8cd7..bbc860b8cd7 100644 --- a/mcs/class/System.Data/aot_only_System.Data.dll.sources +++ b/mcs/class/System.Data/testing_aot_full_System.Data.dll.sources diff --git a/mcs/class/System.Data/aot_only_System.Data_test.dll.exclude.sources b/mcs/class/System.Data/testing_aot_full_System.Data_test.dll.exclude.sources index 0022a9e9f1b..0022a9e9f1b 100644 --- a/mcs/class/System.Data/aot_only_System.Data_test.dll.exclude.sources +++ b/mcs/class/System.Data/testing_aot_full_System.Data_test.dll.exclude.sources diff --git a/mcs/class/System.Data/aot_only_System.Data_test.dll.sources b/mcs/class/System.Data/testing_aot_full_System.Data_test.dll.sources index 310b8c2fb3d..310b8c2fb3d 100644 --- a/mcs/class/System.Data/aot_only_System.Data_test.dll.sources +++ b/mcs/class/System.Data/testing_aot_full_System.Data_test.dll.sources diff --git a/mcs/class/System.IdentityModel/aot_only_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/testing_aot_full_System.IdentityModel.dll.sources index 429636751c2..429636751c2 100644 --- a/mcs/class/System.IdentityModel/aot_only_System.IdentityModel.dll.sources +++ b/mcs/class/System.IdentityModel/testing_aot_full_System.IdentityModel.dll.sources diff --git a/mcs/class/System.Runtime.Serialization/aot_only_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/testing_aot_full_System.Runtime.Serialization.dll.sources index 6caafd41198..6caafd41198 100644 --- a/mcs/class/System.Runtime.Serialization/aot_only_System.Runtime.Serialization.dll.sources +++ b/mcs/class/System.Runtime.Serialization/testing_aot_full_System.Runtime.Serialization.dll.sources diff --git a/mcs/class/System.Security/aot_only_System.Security.dll.sources b/mcs/class/System.Security/testing_aot_full_System.Security.dll.sources index 599b7fa67f7..599b7fa67f7 100644 --- a/mcs/class/System.Security/aot_only_System.Security.dll.sources +++ b/mcs/class/System.Security/testing_aot_full_System.Security.dll.sources diff --git a/mcs/class/System.ServiceModel.Web/aot_only_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/testing_aot_full_System.ServiceModel.Web.dll.sources index cbea0fae7b4..cbea0fae7b4 100644 --- a/mcs/class/System.ServiceModel.Web/aot_only_System.ServiceModel.Web.dll.sources +++ b/mcs/class/System.ServiceModel.Web/testing_aot_full_System.ServiceModel.Web.dll.sources diff --git a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/testing_aot_full_System.ServiceModel.dll.sources index 22ece5ce8ce..22ece5ce8ce 100644 --- a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel.dll.sources +++ b/mcs/class/System.ServiceModel/testing_aot_full_System.ServiceModel.dll.sources diff --git a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.exclude.sources b/mcs/class/System.ServiceModel/testing_aot_full_System.ServiceModel_test.dll.exclude.sources index 350444a823a..350444a823a 100644 --- a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.exclude.sources +++ b/mcs/class/System.ServiceModel/testing_aot_full_System.ServiceModel_test.dll.exclude.sources diff --git a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.sources b/mcs/class/System.ServiceModel/testing_aot_full_System.ServiceModel_test.dll.sources index 275d9f33056..275d9f33056 100644 --- a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.sources +++ b/mcs/class/System.ServiceModel/testing_aot_full_System.ServiceModel_test.dll.sources diff --git a/mcs/class/System.Web.Services/aot_only_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/testing_aot_full_System.Web.Services.dll.sources index 9e39dcc73b1..9e39dcc73b1 100644 --- a/mcs/class/System.Web.Services/aot_only_System.Web.Services.dll.sources +++ b/mcs/class/System.Web.Services/testing_aot_full_System.Web.Services.dll.sources diff --git a/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/testing_aot_full_System.Web.Services_test.dll.exclude.sources index 0dee611d624..0dee611d624 100644 --- a/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.exclude.sources +++ b/mcs/class/System.Web.Services/testing_aot_full_System.Web.Services_test.dll.exclude.sources diff --git a/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.sources b/mcs/class/System.Web.Services/testing_aot_full_System.Web.Services_test.dll.sources index 915ba6cbbec..915ba6cbbec 100644 --- a/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.sources +++ b/mcs/class/System.Web.Services/testing_aot_full_System.Web.Services_test.dll.sources diff --git a/mcs/class/System.XML/aot_only_System.Xml.dll.sources b/mcs/class/System.XML/testing_aot_full_System.Xml.dll.sources index b6630930f75..b6630930f75 100644 --- a/mcs/class/System.XML/aot_only_System.Xml.dll.sources +++ b/mcs/class/System.XML/testing_aot_full_System.Xml.dll.sources diff --git a/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs b/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs index 87f5e3aab3e..25da5dcbba0 100644 --- a/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs +++ b/mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs @@ -45,7 +45,7 @@ namespace System.Net.Sockets { int error = 0; Socket.Blocking_internal (handle, false, out error); -#if AOT_ONLY_DESKTOP +#if FULL_AOT_DESKTOP /* It's only for platforms that do not have working syscall abort mechanism, like WatchOS and TvOS */ Socket.Shutdown_internal (handle, SocketShutdown.Both, out error); #endif diff --git a/mcs/class/System/monodroid_System_test.dll.exclude.sources b/mcs/class/System/monodroid_System_test.dll.exclude.sources index 799115c396c..8b8f4861a48 100644 --- a/mcs/class/System/monodroid_System_test.dll.exclude.sources +++ b/mcs/class/System/monodroid_System_test.dll.exclude.sources @@ -1,4 +1,4 @@ -#include aot_only_System_test.dll.exclude.sources +#include testing_aot_full_System_test.dll.exclude.sources #include monodroid_System_test.dll.new-exclude.sources Microsoft.Win32/IntranetZoneCredentialPolicyCas.cs Microsoft.Win32/IntranetZoneCredentialPolicyTest.cs diff --git a/mcs/class/System/aot_only_System.dll.sources b/mcs/class/System/testing_aot_full_System.dll.sources index e9469d07a62..e9469d07a62 100644 --- a/mcs/class/System/aot_only_System.dll.sources +++ b/mcs/class/System/testing_aot_full_System.dll.sources diff --git a/mcs/class/System/aot_only_System_test.dll.exclude.sources b/mcs/class/System/testing_aot_full_System_test.dll.exclude.sources index 9a453e68f8c..9a453e68f8c 100644 --- a/mcs/class/System/aot_only_System_test.dll.exclude.sources +++ b/mcs/class/System/testing_aot_full_System_test.dll.exclude.sources diff --git a/mcs/class/System/aot_only_System_test.dll.sources b/mcs/class/System/testing_aot_full_System_test.dll.sources index 3944a95be6a..3944a95be6a 100644 --- a/mcs/class/System/aot_only_System_test.dll.sources +++ b/mcs/class/System/testing_aot_full_System_test.dll.sources diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs index a54c6b97d9c..5cef04313c4 100755 --- a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs +++ b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs @@ -196,7 +196,7 @@ namespace System.Security.Cryptography { name = "System.Security.Cryptography.X509Certificates.X509Chain, System"; break; case "aes": -#if AOT_ONLY_DESKTOP +#if FULL_AOT_DESKTOP // TODO: why is this special cased? we could use AesManaged like other full AOT profiles name = "System.Security.Cryptography.AesCryptoServiceProvider, System.Core"; #else name = "System.Security.Cryptography.AesManaged, System.Core"; diff --git a/mcs/class/corlib/System/TimeZoneInfo.cs b/mcs/class/corlib/System/TimeZoneInfo.cs index 89de2ee7462..6e29a65dadc 100644 --- a/mcs/class/corlib/System/TimeZoneInfo.cs +++ b/mcs/class/corlib/System/TimeZoneInfo.cs @@ -152,7 +152,7 @@ namespace System #if !MONODROID && !MONOTOUCH && !XAMMAC static TimeZoneInfo CreateLocal () { -#if !AOT_ONLY_DESKTOP +#if !FULL_AOT_DESKTOP if (IsWindows && LocalZoneKey != null) { string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName"); if (name == null) @@ -204,7 +204,7 @@ namespace System static void GetSystemTimeZonesCore (List<TimeZoneInfo> systemTimeZones) { -#if !AOT_ONLY_DESKTOP +#if !FULL_AOT_DESKTOP if (TimeZoneKey != null) { foreach (string id in TimeZoneKey.GetSubKeyNames ()) { try { @@ -273,7 +273,7 @@ namespace System #endif private AdjustmentRule [] adjustmentRules; -#if !MOBILE || !AOT_ONLY_DESKTOP +#if !MOBILE || !FULL_AOT_DESKTOP /// <summary> /// Determine whether windows of not (taken Stephane Delcroix's code) /// </summary> @@ -301,7 +301,7 @@ namespace System return str.Substring (Istart, Iend-Istart+1); } -#if !AOT_ONLY_DESKTOP +#if !FULL_AOT_DESKTOP static RegistryKey timeZoneKey; static RegistryKey TimeZoneKey { get { @@ -330,7 +330,7 @@ namespace System } } #endif -#endif // !MOBILE || !AOT_ONLY_DESKTOP +#endif // !MOBILE || !FULL_AOT_DESKTOP private static bool TryAddTicks (DateTime date, long ticks, out DateTime result, DateTimeKind kind = DateTimeKind.Unspecified) { diff --git a/mcs/class/corlib/System/__ComObject.cs b/mcs/class/corlib/System/__ComObject.cs index af6c4d8cae7..38f14ade221 100644 --- a/mcs/class/corlib/System/__ComObject.cs +++ b/mcs/class/corlib/System/__ComObject.cs @@ -255,7 +255,7 @@ namespace System #else namespace System { - // this is a shim class so we can AOT during aot_only build without --enable-minimal=com + // this is a shim class so we can AOT during full AOT builds without --enable-minimal=com internal class __ComObject { __ComObject () diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs index be26d45553b..2ec2af50394 100644 --- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs +++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs @@ -265,7 +265,7 @@ namespace MonoTests.System.Reflection public void Corlib_test () { Assembly corlib_test = Assembly.GetExecutingAssembly (); -#if MONODROID || AOT_ONLY_DESKTOP || __WATCHOS__ +#if MONODROID || FULL_AOT_DESKTOP || __WATCHOS__ Assert.IsNull (corlib_test.EntryPoint, "EntryPoint"); Assert.IsNull (corlib_test.Evidence, "Evidence"); #elif MOBILE @@ -474,8 +474,8 @@ namespace MonoTests.System.Reflection // with the semantics of aot'ed assembly loading, as // aot may assert when loading. This assumes that it's // safe to greedly load everything. -#if AOT_ONLY_DESKTOP - string [] names = { "aot_only_corlib_test" }; +#if FULL_AOT_DESKTOP + string [] names = { "testing_aot_full_corlib_test" }; #else string [] names = { "corlib_test_net_1_1", "corlib_test_net_2_0", "corlib_test_net_4_0", "corlib_test_net_4_5", "net_4_x_corlib_test", "corlib_plattest", "mscorlibtests", "BclTests" }; #endif diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs index 148cad2367a..282a5a3f905 100644 --- a/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs @@ -44,7 +44,7 @@ namespace MonoTests.System.Security.Cryptography { [Test] [Category ("AndroidNotWorking")] // Exception is thrown: CryptographicException : Bad PKCS7 padding. Invalid length 236. - [Category ("MobileNotWorking")] // On aot_only, above exception is thrown as well + [Category ("MobileNotWorking")] // On testing_aot_full, above exception is thrown as well public void Roundtrip () { // that will return a AesCryptoServiceProvider diff --git a/mcs/class/corlib/aot_only_corlib_test.dll.exclude.sources b/mcs/class/corlib/testing_aot_full_corlib_test.dll.exclude.sources index eb17a105b75..eb17a105b75 100644 --- a/mcs/class/corlib/aot_only_corlib_test.dll.exclude.sources +++ b/mcs/class/corlib/testing_aot_full_corlib_test.dll.exclude.sources diff --git a/mcs/class/corlib/aot_only_corlib_test.dll.sources b/mcs/class/corlib/testing_aot_full_corlib_test.dll.sources index 011effe162c..011effe162c 100644 --- a/mcs/class/corlib/aot_only_corlib_test.dll.sources +++ b/mcs/class/corlib/testing_aot_full_corlib_test.dll.sources diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index a5e9b266646..c6c6a629c66 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -489,7 +489,7 @@ test_sources = \ regtests_UNIVERSAL=basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe iltests.exe devirtualization.exe generics.exe basic-simd.exe basic-vectors.exe -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL regtests= \ $(regtests_UNIVERSAL) @@ -501,7 +501,7 @@ endif else regtests= \ $(regtests_UNIVERSAL) \ - $(regtests_AOT_ONLY_BLACKLIST) + $(regtests_TESTING_AOT_FULL_BLACKLIST) endif if X86 @@ -744,9 +744,9 @@ gsharedvtcheck: fullaot_regtests = $(regtests) aot-tests.exe $(if $(GSHAREDVT),gshared.exe) # Skip aoting the tests that aren't compiled -# on the aot_only profile because they're skipped +# on the testing_aot_full profile because they're skipped # on mobile profiles -FULLAOT_LIBS_AOT_ONLY_BLACKLIST = \ +FULLAOT_LIBS_TESTING_AOT_FULL_BLACKLIST = \ Mono.Posix.dll \ System.Configuration.dll @@ -759,14 +759,14 @@ FULLAOT_LIBS_UNIVERSAL = \ Mono.Simd.dll \ Mono.Security.dll -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL FULLAOT_LIBS= \ Mono.Dynamic.Interpreter.dll \ $(FULLAOT_LIBS_UNIVERSAL) else FULLAOT_LIBS= \ $(FULLAOT_LIBS_UNIVERSAL) \ - $(FULLAOT_LIBS_AOT_ONLY_BLACKLIST) + $(FULLAOT_LIBS_TESTING_AOT_FULL_BLACKLIST) endif FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index eaae1b72b94..3be63e5db1b 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = assemblyresolve gc-descriptors -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL FEATUREFUL_RUNTIME_TEST = else FEATUREFUL_RUNTIME_TEST = test-appdomain-unload @@ -46,7 +46,7 @@ MKBUNDLE = \ PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \ $(RUNTIME) $(CLASS)/mkbundle.exe -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY,FULL_AOT_DESKTOP endif @@ -64,7 +64,7 @@ MCS = $(MCS_NO_LIB) -lib:$(CLASS) ILASM = $(RUNTIME) $(CLASS)/ilasm.exe -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)" --aot-run-flags "$(AOT_RUN_FLAGS)" --aot-build-flags "$(AOT_BUILD_FLAGS)" else TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)" @@ -713,7 +713,7 @@ endif PROFILE_DISABLED_TESTS= -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL # Tests which rely on TypeLoadExceptions # In full-aot mode, these cause the relevant methods to be not AOTed. PROFILE_DISABLED_TESTS += \ @@ -752,7 +752,7 @@ PROFILE_DISABLED_TESTS += \ thunks.exe # Tests which load assemblies which are not -# in the aot_only profile +# in the testing_aot_full profile PROFILE_DISABLED_TESTS += \ assembly-load-remap.exe @@ -922,13 +922,13 @@ EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \ %.exe: %.il $(ILASM) -out:$@ $< -if !INSTALL_AOT_ONLY +if !INSTALL_TESTING_AOT_FULL if !INSTALL_AOT_HYBRID TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll endif endif -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX) else TEST_DRIVER_DEPEND=TestDriver.dll @@ -981,7 +981,7 @@ bug-81466-lib.dll$(PLATFORM_AOT_SUFFIX) \ TestingReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX) \ TestingReferenceReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX) -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL prereqs: $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS) else prereqs: $(PREREQSI_IL) $(PREREQSI_CS) @@ -1026,7 +1026,7 @@ test-sgen : sgen-tests # Precompile the test assemblies in parallel compile-tests: $(MAKE) -j4 $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS) -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(MAKE) $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS) endif @@ -1235,7 +1235,7 @@ SGEN_REGULAR_TESTS_SRC = \ SGEN_REGULAR_DISABLED_TESTS= -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL SGEN_REGULAR_DISABLED_TESTS += \ sgen-domain-unload.exe \ sgen-domain-unload-2.exe @@ -1445,7 +1445,7 @@ imt_big_iface_test.exe: $(TEST_DRIVER_DEPEND) make-imt-test.exe EXTRA_DIST += test-inline-call-stack-library.cs test-inline-call-stack.cs test-inline-call-stack-library.dll: $(TEST_DRIVER_DEPEND) $(srcdir)/test-inline-call-stack-library.cs $(MCS) -t:library -out:test-inline-call-stack-library.dll $(srcdir)/test-inline-call-stack-library.cs -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif @@ -1492,7 +1492,7 @@ bug-81673.exe bug-81673-interface.dll: $(srcdir)/bug-81673.cs $(srcdir)/bug-8167 $(MCS) -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs $(MCS) -out:bug-81673.exe -r:bug-81673-interface.dll $(srcdir)/bug-81673.cs $(MCS) -define:WITH_STOP -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif @@ -1501,7 +1501,7 @@ bug-36848.exe bug-36848-a.dll: $(srcdir)/bug-36848.cs $(srcdir)/bug-36848-a.cs $(MCS) -target:library -out:bug-36848-a.dll $(srcdir)/bug-36848-a.cs $(MCS) -r:bug-36848-a.dll -out:bug-36848.exe $(srcdir)/bug-36848.cs $(MCS) -target:library -out:bug-36848-a.dll $(srcdir)/bug-36848-a.cs /define:WITH_STOP -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif @@ -1516,7 +1516,7 @@ bug-81691.exe: bug-81691-b.dll EXTRA_DIST += bug-81466-lib.il bug-81466-lib.dll: bug-81466-lib.il $(ILASM) /dll /output:bug-81466-lib.dll $(srcdir)/bug-81466-lib.il -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif bug-81466.exe: bug-81466.il bug-81466-lib.dll @@ -1525,7 +1525,7 @@ bug-81466.exe: bug-81466.il bug-81466-lib.dll EXTRA_DIST += bug-324535-il.il bug-324535-il.dll : bug-324535-il.il $(ILASM) /dll /output:bug-324535-il.dll $(srcdir)/bug-324535-il.il -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif bug-324535.exe : bug-324535.cs bug-324535-il.dll @@ -1534,7 +1534,7 @@ bug-324535.exe : bug-324535.cs bug-324535-il.dll EXTRA_DIST += custom-modifiers.2.cs custom-modifiers-lib.il custom-modifiers-lib.dll: custom-modifiers-lib.il $(ILASM) /dll /output:custom-modifiers-lib.dll $(srcdir)/custom-modifiers-lib.il -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif custom-modifiers.2.exe: custom-modifiers.2.cs custom-modifiers-lib.dll @@ -1543,7 +1543,7 @@ custom-modifiers.2.exe: custom-modifiers.2.cs custom-modifiers-lib.dll EXTRA_DIST += bug-382986-lib.cs bug-382986-lib.dll: bug-382986-lib.cs $(MCS) -target:library -out:$@ $(srcdir)/bug-382986-lib.cs -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif @@ -1570,14 +1570,14 @@ test-coreclr-security : coreclr-security.exe EXTRA_DIST += generic-unboxing.2.il generic-unboxing.2.dll : generic-unboxing.2.il $(ILASM) /dll /output:generic-unboxing.2.dll $(srcdir)/generic-unboxing.2.il -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif EXTRA_DIST += generic-boxing.2.il generic-boxing.2.dll : generic-boxing.2.il generic-unboxing.2.dll $(ILASM) /dll /output:generic-boxing.2.dll $(srcdir)/generic-boxing.2.il -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif @@ -1592,7 +1592,7 @@ generic-box.2.exe : generic-box.2.cs generic-unboxing.2.dll generic-boxing.2.dll EXTRA_DIST += generic-delegate2.2.cs generic-delegate2-lib.2.il generic-delegate2-lib.2.dll : generic-delegate2-lib.2.il $(ILASM) /dll /output:$@ $(srcdir)/generic-delegate2-lib.2.il -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif generic-delegate2.2.exe : generic-delegate2.2.cs generic-delegate2-lib.2.dll @@ -1663,7 +1663,7 @@ GSHARED_TESTS_SRC = \ GSHARED_DISABLED_TESTS= -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL GSHARED_DISABLED_TESTS += \ generic-type-builder.2.exe endif diff --git a/mono/tests/assemblyresolve/Makefile.am b/mono/tests/assemblyresolve/Makefile.am index 1d3942ffa4f..7cf52bca24f 100644 --- a/mono/tests/assemblyresolve/Makefile.am +++ b/mono/tests/assemblyresolve/Makefile.am @@ -5,7 +5,7 @@ with_mono_path = MONO_PATH=$(CLASS) RUNTIME = $(top_builddir)/runtime/mono-wrapper --debug MCS = $(with_mono_path) $(RUNTIME) $(CSC) -noconfig -nologo -debug:portable -target:library -if INSTALL_AOT_ONLY +if INSTALL_TESTING_AOT_FULL prereq: aot else prereq: test/asm.dll diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 5224c91837f..d9fcbdac16b 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -52,8 +52,8 @@ if INSTALL_AOT_HYBRID build_profiles += aot_hybrid endif -if INSTALL_AOT_ONLY -build_profiles += aot_only +if INSTALL_TESTING_AOT_FULL +build_profiles += testing_aot_full endif if INSTALL_XAMMAC @@ -113,20 +113,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 INSTALL_TESTING_AOT_FULL +# 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 +TESTING_AOT_FULL_FILTER=grep -v ilasm else -AOT_ONLY_FILTER=echo +TESTING_AOT_FULL_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)$$' | $(TESTING_AOT_FULL_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 \ diff --git a/scripts/ci/run-test-aot_only.sh b/scripts/ci/run-test-testing_aot_full.sh index c8b5d79d32b..c8b5d79d32b 100755 --- a/scripts/ci/run-test-aot_only.sh +++ b/scripts/ci/run-test-testing_aot_full.sh |