Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs/build
diff options
context:
space:
mode:
authorJohan Lorensson <lateralusx.github@gmail.com>2019-06-20 10:23:39 +0300
committerGitHub <noreply@github.com>2019-06-20 10:23:39 +0300
commitdfb46dad7d0a2e0611cf01bb7ebc4ac1b65b66bd (patch)
tree8d122a8254e0e8b866ecf16743bff83a558d3043 /mcs/build
parentb2a860c94914b87db5f01be0a1ab0d5fdaf43579 (diff)
Add Windows x64 Full AOT Interpreter support on CI. (#15127)
Add support to run full interpreter test suite on CI for Windows x64 Full AOT. Since Windows x64 Full AOT uses a different full AOT profile WinAOT a separate testing profile was setup for the interpreter testing. NOTE, this profile is pure for testing, inline with the other testing profiles. It is also reusing most of its sources from other sources files (mainly WinAOT) to reduce maintenance of the profile. Commit also includes some smaller adjustments needed in order to get full pass rate for Windows x64 Full AOT + Interpreter on CI.
Diffstat (limited to 'mcs/build')
-rw-r--r--mcs/build/profiles/testing_winaot_interp.make13
-rw-r--r--mcs/build/profiles/winaot.make38
-rw-r--r--mcs/build/profiles/winaot_common.make35
3 files changed, 52 insertions, 34 deletions
diff --git a/mcs/build/profiles/testing_winaot_interp.make b/mcs/build/profiles/testing_winaot_interp.make
new file mode 100644
index 00000000000..49c0ce55c36
--- /dev/null
+++ b/mcs/build/profiles/testing_winaot_interp.make
@@ -0,0 +1,13 @@
+#! -*- makefile -*-
+
+include $(topdir)/build/profiles/winaot_common.make
+
+PROFILE_MCS_FLAGS += \
+ -d:FULL_AOT_INTERP \
+ -d:DISABLE_SECURITY \
+ -d:DISABLE_REMOTING
+
+DISABLE_REMOTING = yes
+NO_MULTIPLE_APPDOMAINS = yes
+
+PROFILE_TEST_HARNESS_EXCLUDES := MobileNotWorking PKITS
diff --git a/mcs/build/profiles/winaot.make b/mcs/build/profiles/winaot.make
index a0ded0dc7a0..18b16651a06 100644
--- a/mcs/build/profiles/winaot.make
+++ b/mcs/build/profiles/winaot.make
@@ -1,43 +1,13 @@
#! -*- makefile -*-
-BOOTSTRAP_PROFILE = build
+include $(topdir)/build/profiles/winaot_common.make
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
-MCS = $(BOOTSTRAP_MCS)
-
-profile-check:
- @:
-
-DEFAULT_REFERENCES = mscorlib
-
-PROFILE_MCS_FLAGS = \
- -d:NET_1_1 \
- -d:NET_2_0 \
- -d:NET_2_1 \
- -d:NET_3_5 \
- -d:NET_4_0 \
- -d:NET_4_5 \
- -d:MONO \
- -d:MOBILE,MOBILE_LEGACY \
+PROFILE_MCS_FLAGS += \
-d:FULL_AOT_DESKTOP \
- -d:FULL_AOT_RUNTIME \
- -d:DISABLE_COM \
- -d:WIN_PLATFORM \
- -d:WINAOT \
- -nowarn:1699 \
- -nostdlib \
- $(PLATFORM_DEBUG_FLAGS)
-
-API_BIN_PROFILE = build/monotouch
-FRAMEWORK_VERSION = 2.1
+ -d:FULL_AOT_RUNTIME
-# the tuner takes care of the install
-NO_INSTALL = yes
-AOT_FRIENDLY_PROFILE = yes
-ALWAYS_AOT_BCL = yes
ALWAYS_AOT_TESTS = yes
-MOBILE_PROFILE = yes
NO_VTS_TEST = yes
NO_SRE = yes
-PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking PKITS SRE NotWorkingLinqInterpreter
+PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking PKITS SRE NotWorkingLinqInterpreter \ No newline at end of file
diff --git a/mcs/build/profiles/winaot_common.make b/mcs/build/profiles/winaot_common.make
new file mode 100644
index 00000000000..49f0e5be69c
--- /dev/null
+++ b/mcs/build/profiles/winaot_common.make
@@ -0,0 +1,35 @@
+#! -*- makefile -*-
+
+BOOTSTRAP_PROFILE = build
+
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
+MCS = $(BOOTSTRAP_MCS)
+
+profile-check:
+ @:
+
+DEFAULT_REFERENCES = mscorlib
+
+PROFILE_MCS_FLAGS = \
+ -d:NET_1_1 \
+ -d:NET_2_0 \
+ -d:NET_2_1 \
+ -d:NET_3_5 \
+ -d:NET_4_0 \
+ -d:NET_4_5 \
+ -d:MONO \
+ -d:MOBILE,MOBILE_LEGACY \
+ -d:DISABLE_COM \
+ -d:WIN_PLATFORM \
+ -d:WINAOT \
+ -nowarn:1699 \
+ -nostdlib \
+ $(PLATFORM_DEBUG_FLAGS)
+
+API_BIN_PROFILE = build/monotouch
+FRAMEWORK_VERSION = 2.1
+
+NO_INSTALL = yes
+AOT_FRIENDLY_PROFILE = yes
+ALWAYS_AOT_BCL = yes
+MOBILE_PROFILE = yes \ No newline at end of file