Merge pull request #554 from deplinenoise/ppc_fixes

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

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index baaab1dd7cee0523c488fa1ff13892d40ce6d0ac..c36b99b58aa82fdf5ca4bce0c6c8b3b0f30f857b 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -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,8 @@ 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
 
 TEST_CS_SRC_DIST=      \
        $(BASE_TEST_CS_SRC)     \
@@ -446,7 +445,6 @@ 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
 # bug-459094.exe creates an extremely deep directory tree
 # delegate-invoke.exe depends on 929c6bc9b6d76a273f251e6f5dfacac36e9c38bd which was
 # reverted.
@@ -634,7 +632,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
@@ -787,7 +785,8 @@ 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 =