Fix two test failures in the FullAOT Jenkins job

[mono.git] / mono / tests / Makefile.am

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 0ac6d87689963392f0f37e620a9e5bf1332fa64d..9f3996923b4931e3420e9811db9233fdf3d60852 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -6,7 +6,7 @@ else
 FEATUREFUL_RUNTIME_TEST = test-appdomain-unload
 endif
 
-check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-cattr-type-load test-reflection-load-with-context test_platform     \
+check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-multi-netmodule test-cattr-type-load test-reflection-load-with-context test_platform        \
                 test-console-output test-messages test-env-options test-unhandled-exception-2 $(FEATUREFUL_RUNTIME_TEST) test-process-stress rm-empty-logs
 check-full: test-sgen check-local
 check-parallel: compile-tests check-full
@@ -122,6 +122,7 @@ BASE_TEST_MOBILE_STATIC_NOT_SUPPORTED= \
        bug-462592.cs   # Need SRE \
        bug-575941.cs   # Need SRE \
        bug-389886-3.cs # Need SRE \
+       constant-division.cs    # Need SRE \
        dynamic-method-resurrection.cs  # Need SRE \
        bug-80307.cs    # Need System.Web \
        assembly_append_ordering.cs # Need SRE \
@@ -139,10 +140,12 @@ BASE_TEST_MOBILE_STATIC_NOT_SUPPORTED= \
        threadpool-exceptions7.cs # Needs AppDomains \
        cross-domain.cs # Needs AppDomains \
        generic-unloading.2.cs # Needs AppDomains \
+       namedmutex-destroy-race.cs # needs named Mutex \
        thread6.cs # On MOBILE, ThreadAbortException doesn't have necessary field for this test
 
 # Disabled until ?mcs is fixed
 #      bug-331958.cs
+# Note: only add tests that are compatible with mobile_static to this category
 BASE_TEST_CS_SRC_UNIVERSAL=            \
        generic-unloading-sub.2.cs      \
        create-instance.cs      \
@@ -254,7 +257,6 @@ BASE_TEST_CS_SRC_UNIVERSAL=         \
        long.cs                 \
        jit-ulong.cs            \
        jit-float.cs            \
-       constant-division.cs    \
        pop.cs                  \
        time.cs                 \
        pointer.cs              \
@@ -465,7 +467,9 @@ BASE_TEST_CS_SRC_UNIVERSAL=         \
        pinvoke_ppcf.cs \
        pinvoke_ppcd.cs \
        bug-29585.cs    \
-       priority.cs
+       priority.cs     \
+       abort-cctor.cs  \
+       thread-native-exit.cs
 
 if INSTALL_MOBILE_STATIC
 BASE_TEST_CS_SRC= \
@@ -1063,6 +1067,14 @@ test-type-load: $(TEST_DRIVER_DEPEND)
        @echo "Testing load-exception.exe..."
        @$(RUNTIME) load-exceptions.exe > load-exceptions.exe.stdout 2> load-exceptions.exe.stderr
 
+EXTRA_DIST += test-multi-netmodule-1-netmodule.cs test-multi-netmodule-2-dll1.cs test-multi-netmodule-3-dll2.cs test-multi-netmodule-4-exe.cs
+test-multi-netmodule:
+       @$(MCS) -t:module test-multi-netmodule-1-netmodule.cs
+       @$(MCS) -addmodule:test-multi-netmodule-1-netmodule.netmodule -t:library test-multi-netmodule-2-dll1.cs
+       @$(MCS) -addmodule:test-multi-netmodule-1-netmodule.netmodule -t:library test-multi-netmodule-3-dll2.cs
+       @$(MCS) -r:test-multi-netmodule-2-dll1.dll test-multi-netmodule-4-exe.cs
+       $(RUNTIME) test-multi-netmodule-4-exe.exe > test-multi-netmodule-4-exe.exe.stdout 2> test-multi-netmodule-4-exe.exe.stderr
+
 EXTRA_DIST += custom-attr-errors.cs custom-attr-errors-lib.cs
 test-cattr-type-load: $(TEST_DRIVER_DEPEND) custom-attr-errors.cs custom-attr-errors-lib.cs
        $(MCS) -D:WITH_MEMBERS /t:library $(srcdir)/custom-attr-errors-lib.cs