From 4fb9e11be7d0ea5069e2da3ea5d66b35ba949086 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 23 Feb 2017 18:23:00 -0500 Subject: [PATCH] [hybrid] Fix more tests run --- mono/mini/Makefile.am.in | 71 +++++++++++++++++++++++++--------------- mono/tests/Makefile.am | 53 +++++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 31 deletions(-) diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 37c19cabc3e..59888bbc64d 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -498,25 +498,45 @@ test_sources = \ gc-test.cs \ gshared.cs +if NACL_CODEGEN +test_sources += nacl.cs +endif -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 -iregtests=basic.exe basic-float.exe basic-long.exe basic-calls.exe generics.exe objects.exe - -if FULL_AOT_TESTS -regtests= \ - $(regtests_UNIVERSAL) +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 NACL_CODEGEN -test_sources += nacl.cs -regtests += nacl.exe +regtests_UNIVERSAL += nacl.exe endif -else -regtests= \ - $(regtests_UNIVERSAL) \ - $(regtests_FULL_AOT_TESTS_BLACKLIST) +regtests_DISABLED = + +if FULL_AOT_TESTS +regtests_DISABLED += endif +regtests = $(filter-out $(regtests_DISABLED),$(regtests_UNIVERSAL)) + +iregtests = \ + basic.exe \ + basic-float.exe \ + basic-long.exe \ + basic-calls.exe \ + generics.exe \ + objects.exe + if X86 arch_sources = $(x86_sources) arch_built=cpu-x86.h @@ -759,13 +779,6 @@ gsharedvtcheck: fullaot_regtests = $(regtests) aot-tests.exe $(if $(GSHAREDVT),gshared.exe) -# Skip aoting the tests that aren't compiled -# on the full aot profiles because they're skipped -# on mobile profiles -FULLAOT_LIBS_FULL_AOT_TESTS_BLACKLIST = \ - Mono.Posix.dll \ - System.Configuration.dll - FULLAOT_LIBS_UNIVERSAL = \ mscorlib.dll \ System.Core.dll \ @@ -775,17 +788,23 @@ FULLAOT_LIBS_UNIVERSAL = \ Mono.Simd.dll \ Mono.Security.dll \ System.Numerics.dll \ - System.Numerics.Vectors.dll + System.Numerics.Vectors.dll \ + Mono.Posix.dll \ + System.Configuration.dll + +FULLAOT_LIBS_DISABLED = if FULL_AOT_TESTS -FULLAOT_LIBS= \ - $(FULLAOT_LIBS_UNIVERSAL) -else -FULLAOT_LIBS= \ - $(FULLAOT_LIBS_UNIVERSAL) \ - $(FULLAOT_LIBS_FULL_AOT_TESTS_BLACKLIST) +# Skip aoting the tests that aren't compiled +# on the full aot profiles because they're skipped +# on mobile profiles +FULLAOT_LIBS_DISABLED += \ + Mono.Posix.dll \ + System.Configuration.dll endif +FULLAOT_LIBS = $(filter-out $(FULLAOT_LIBS_DISABLED),$(FULLAOT_LIBS_UNIVERSAL)) + FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp # This currently only works on amd64/arm diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index d809141dcf4..5062f48d39c 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -65,10 +65,14 @@ MCS = $(MCS_NO_LIB) -lib:$(CLASS) ILASM = $(TOOLS_RUNTIME) $(mcs_topdir)/class/lib/build/ilasm.exe -if FULL_AOT_TESTS -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)" + +if FULL_AOT_TESTS +TEST_RUNNER += --aot-run-flags "$(AOT_RUN_FLAGS)" --aot-build-flags "$(AOT_BUILD_FLAGS)" +endif + +if HYBRID_AOT_TESTS +TEST_RUNNER += --aot-run-flags "$(AOT_RUN_FLAGS)" --aot-build-flags "$(AOT_BUILD_FLAGS)" endif @@ -930,16 +934,18 @@ EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \ $(ILASM) -out:$@ $< if !FULL_AOT_TESTS -if !HYBRID_AOT_TESTS TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll endif -endif if FULL_AOT_TESTS TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX) else +if HYBRID_AOT_TESTS +TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX) +else TEST_DRIVER_DEPEND=TestDriver.dll endif +endif %.exe: %.cs $(TEST_DRIVER_DEPEND) $(MCS) -r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:TestDriver.dll $(TEST_DRIVER_HARD_KILL_FEATURE) -out:$@ $< @@ -995,8 +1001,12 @@ bug-81466-lib.dll$(PLATFORM_AOT_SUFFIX) if FULL_AOT_TESTS prereqs: $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS) else +if HYBRID_AOT_TESTS +prereqs: $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS) +else prereqs: $(PREREQSI_IL) $(PREREQSI_CS) endif +endif # Target to precompile the test executables tests: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la prereqs $(GSHARED_TESTS) @@ -1040,6 +1050,9 @@ compile-tests: if FULL_AOT_TESTS $(MAKE) $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS) endif +if HYBRID_AOT_TESTS + $(MAKE) $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS) +endif # Remove empty .stdout and .stderr files for wrench rm-empty-logs: @@ -1462,6 +1475,9 @@ test-inline-call-stack-library.dll: $(TEST_DRIVER_DEPEND) $(srcdir)/test-inline- if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif test-inline-call-stack.exe: $(TEST_DRIVER_DEPEND) test-inline-call-stack-library.dll $(srcdir)/test-inline-call-stack.cs $(MCS) -r:TestDriver.dll -r:test-inline-call-stack-library.dll -out:test-inline-call-stack.exe $(srcdir)/test-inline-call-stack.cs @@ -1509,6 +1525,9 @@ bug-81673.exe bug-81673-interface.dll: $(srcdir)/bug-81673.cs $(srcdir)/bug-8167 if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif EXTRA_DIST += bug-36848-a.cs bug-36848.exe bug-36848-a.dll: $(srcdir)/bug-36848.cs $(srcdir)/bug-36848-a.cs @@ -1518,6 +1537,9 @@ bug-36848.exe bug-36848-a.dll: $(srcdir)/bug-36848.cs $(srcdir)/bug-36848-a.cs if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif EXTRA_DIST += bug-81691-a.cs bug-81691-b.cs bug-81691.exe bug-81691-b.dll: $(srcdir)/bug-81691.cs $(srcdir)/bug-81691-a.cs $(srcdir)/bug-81691-b.cs @@ -1533,6 +1555,9 @@ bug-81466-lib.dll: bug-81466-lib.il if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif bug-81466.exe: bug-81466.il bug-81466-lib.dll $(ILASM) /exe /output:bug-81466.exe $(srcdir)/bug-81466.il @@ -1542,6 +1567,9 @@ bug-324535-il.dll : bug-324535-il.il if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif bug-324535.exe : bug-324535.cs bug-324535-il.dll $(MCS) -r:bug-324535-il.dll -out:bug-324535.exe $(srcdir)/bug-324535.cs @@ -1551,6 +1579,9 @@ custom-modifiers-lib.dll: custom-modifiers-lib.il if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif custom-modifiers.2.exe: custom-modifiers.2.cs custom-modifiers-lib.dll $(MCS) -r:custom-modifiers-lib.dll -out:custom-modifiers.2.exe $(srcdir)/custom-modifiers.2.cs @@ -1560,6 +1591,9 @@ bug-382986-lib.dll: bug-382986-lib.cs if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif bug-382986.exe: bug-382986.cs bug-382986-lib.dll $(MCS) -out:$@ -r:bug-382986-lib.dll $(srcdir)/bug-382986.cs @@ -1587,6 +1621,9 @@ generic-unboxing.2.dll : generic-unboxing.2.il if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif EXTRA_DIST += generic-boxing.2.il generic-boxing.2.dll : generic-boxing.2.il generic-unboxing.2.dll @@ -1594,6 +1631,9 @@ generic-boxing.2.dll : generic-boxing.2.il generic-unboxing.2.dll if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif EXTRA_DIST += generic-unbox.2.cs generic-unbox.2.exe : generic-unbox.2.cs generic-unboxing.2.dll @@ -1609,6 +1649,9 @@ generic-delegate2-lib.2.dll : generic-delegate2-lib.2.il if FULL_AOT_TESTS $(RUNTIME) $(AOT_BUILD_FLAGS) $@ endif +if HYBRID_AOT_TESTS + $(RUNTIME) $(AOT_BUILD_FLAGS) $@ +endif generic-delegate2.2.exe : generic-delegate2.2.cs generic-delegate2-lib.2.dll $(MCS) -r:generic-delegate2-lib.2.dll -out:$@ $(srcdir)/generic-delegate2.2.cs -- 2.25.1