Merge pull request #505 from roji/shutdown_flow

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

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index ccf43ac965c3cbb48539fe9798676d2aa11b8d94..455a4b159409ec7d342845a5cc1b01e7fb533627 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cas assemblyresolve
+SUBDIRS = cas assemblyresolve gc-descriptors
 
 check-local: test
 
@@ -360,8 +360,6 @@ BASE_TEST_CS_SRC=           \
        gchandles.cs    \
        interlocked-3.cs        \
        interlocked-4.2.cs      \
-       finalizer-wait.cs       \
-       critical-finalizers.cs  \
        appdomain-thread-abort.cs \
        xdomain-threads.cs      \
        w32message.cs   \
@@ -388,7 +386,9 @@ BASE_TEST_CS_SRC=           \
        async-with-cb-throws.cs \
        appdomain-unload-doesnot-raise-pending-events.cs        \
        bug-6148.cs     \
-       assembly_append_ordering.cs
+       assembly_append_ordering.cs     \
+       bug-10127.cs    \
+       allow-synchronous-major.cs
 
 TEST_CS_SRC_DIST=      \
        $(BASE_TEST_CS_SRC)     \
@@ -446,17 +446,12 @@ PLATFORM_DISABLED_TESTS=dynamic-method-resurrection.exe
 #PLATFORM_DISABLED_TESTS=dynamic-method-resurrection.exe exception17.exe
 endif
 
-# The two finalizer tests only work under sgen
-# gc-altstack.exe fails under boehm because it has no support for altstack
 # bug-459094.exe creates an extremely deep directory tree
 # delegate-invoke.exe depends on 929c6bc9b6d76a273f251e6f5dfacac36e9c38bd which was
 # reverted.
 DISABLED_TESTS=                        \
        delegate-async-exception.exe    \
        bug-348522.2.exe        \
-       finalizer-wait.exe      \
-       critical-finalizers.exe \
-       gc-altstack.exe \
        bug-459094.exe \
        delegate-invoke.exe \
        $(PLATFORM_DISABLED_TESTS)
@@ -638,7 +633,7 @@ endif
 endif
 endif
 
-test: assemblyresolve/test/asm.dll testjit test-type-load test-generic-sharing test_platform test_2_1 test-messages
+test: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test_platform test_2_1 test-process-exit test-sgen test-messages rm-empty-logs
 test-wrench: assemblyresolve/test/asm.dll testjit-wrench test-generic-sharing test-type-load test_platform test_2_1 test-process-exit test-sgen test-messages rm-empty-logs
 
 # Remove empty .stdout and .stderr files for wrench
@@ -791,12 +786,15 @@ test-type-load: TestDriver.dll
        @$(RUNTIME) load-exceptions.exe > load-exceptions.exe.stdout 2> load-exceptions.exe.stderr
 
 
-EXTRA_DIST += sgen-bridge.cs sgen-descriptors.cs sgen-gshared-vtype.cs sgen-bridge-major-fragmentation.cs sgen-domain-unload.cs sgen-weakref-stress.cs sgen-cementing-stress.cs sgen-case-23400.cs
+EXTRA_DIST += sgen-bridge.cs sgen-descriptors.cs sgen-gshared-vtype.cs sgen-bridge-major-fragmentation.cs sgen-domain-unload.cs sgen-weakref-stress.cs sgen-cementing-stress.cs sgen-case-23400.cs     finalizer-wait.cs critical-finalizers.cs
+
 
 #those are actually configurations, eg plain_sgen-descriptors.exe
 #DISABLE_SGEN_TESTS =
 
 SGEN_TESTS =   \
+       finalizer-wait.exe      \
+       critical-finalizers.exe \
        sgen-descriptors.exe    \
        sgen-gshared-vtype.exe  \
        sgen-domain-unload.exe  \
@@ -809,16 +807,8 @@ SGEN_CONFIGURATIONS =      \
        "major=marksweep-par|ms-par"    \
        "major=marksweep-conc|ms-conc"  \
        "major=marksweep-conc,minor=split|ms-conc-split"        \
-       "major=marksweep-par,minor=split|ms-par-split"  \
        "minor=split|ms-split"  \
-       "major=marksweep-par,minor=split,alloc-ratio=95|ms-par-split-95"        \
-       "minor=split,alloc-ratio=95|ms-split-95"        \
-       "major=marksweep-par,wbarrier=remset|ms-par-ssb"        \
-       "wbarrier=remset|ms-ssb"        \
-       "major=marksweep-par,minor=split,wbarrier=remset|ms-par-split-ssb"      \
-       "minor=split,wbarrier=remset|ms-split-ssb"      \
-       "major=marksweep-par,minor=split,alloc-ratio=95,wbarrier=remset|ms-par-split-ssb-95"    \
-       "minor=split,alloc-ratio=95,wbarrier=remset|ms-split-ssb-95"
+       "minor=split,alloc-ratio=95|ms-split-95"
 
 #FIXME We should move to use SGEN_CONFIGURATIONS once sgen supports trailling commas or its argument list.
 SGEN_BRIDGE_CONFIGURATIONS =   \
@@ -1072,12 +1062,16 @@ patch-libtool:
        sed -e 's,LIBTOOL =,LIBTOOL2 =,g' Makefile > 2 && echo "LIBTOOL = bash ./libtool" > 1 && cat 1 2 > Makefile
        touch libtest.c
 
-EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected
+EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
 test-process-exit:
        @$(MCS) $(srcdir)/bug-438454.cs -out:bug-438454.exe
        @echo "Testing bug-438454.exe..."
        @$(RUNTIME) bug-438454.exe > bug-438454.exe.stdout
        @diff -w bug-438454.exe.stdout $(srcdir)/bug-438454.exe.stdout.expected
+       @$(MCS) $(srcdir)/threadpool-in-processexit.cs -out:threadpool-in-processexit.exe
+       @echo "Testing threadpool-in-processexit.exe..."
+       @$(RUNTIME) threadpool-in-processexit.exe > threadpool-in-processexit.exe.stdout
+       @diff -w threadpool-in-processexit.exe.stdout $(srcdir)/threadpool-in-processexit.exe.stdout.expected
 
 OOM_TESTS =    \
        gc-oom-handling.exe     \