Introduce a test-wrench target so we can disable tests only on wrench.

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 1826a2def592ba06d207f042433cb9e3b89af3f4..e18767269720bc1a9d0ea4392baf3583b94c47fa 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -402,7 +402,6 @@ TEST_CS_SRC = $(BASE_TEST_CS_SRC) $(TEST_CS_SRC_GEN) async-exc-compilation.cs fi
 PLATFORM_DISABLED_TESTS = finally_guard.exe
 else
 if X86
-PLATFORM_DISABLED_TESTS = finally_guard.exe main-returns-background-abort-resetabort.exe main-returns-background.exe
 TEST_CS_SRC = $(BASE_TEST_CS_SRC) $(TEST_CS_SRC_GEN) async-exc-compilation.cs finally_guard.cs
 else
 TEST_CS_SRC = $(BASE_TEST_CS_SRC) $(TEST_CS_SRC_GEN)
@@ -458,10 +457,21 @@ DISABLED_TESTS=                   \
        bug-459094.exe \
        delegate-invoke.exe \
        generic_type_definition.2.exe \
+       $(PLATFORM_DISABLED_TESTS)
+
+DISABLED_TESTS_WRENCH= \
+       $(DISABLED_TESTS)       \
+       $(PLATFORM_DISABLED_TESTS_WRENCH)
        main-returns-background-resetabort.exe \
+       main-returns-background-abort-resetabort.exe    \
+       main-returns-background.exe     \
+       thread6.exe     \
        assemblyresolve_event3.exe \
-       delegate2.exe \
-       $(PLATFORM_DISABLED_TESTS)
+       delegate2.exe   \
+       finally_guard.exe       \
+       finalizer-abort.exe     \
+       finalizer-exit.exe      \
+       finalizer-thread.exe
 
 AOT_DISABLED_TESTS=constraints-load.exe
 
@@ -622,9 +632,9 @@ endif
 endif
 endif
 
-# test_messages fails on the buildbots
-#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: assemblyresolve/test/asm.dll testjit test-type-load test-generic-sharing test_platform test_2_1 test_messages
+#test_messages fails on the buildbots
+test-wrench: assemblyresolve/test/asm.dll testjit-wrench test-generic-sharing test-type-load test_platform test_2_1 test-process-exit test-sgen
 
 assemblyresolve/test/asm.dll:
        $(MAKE) -C assemblyresolve prereq
@@ -665,6 +675,32 @@ testb: $(TEST_PROG) $(TESTBS)
                $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS);     \
        done
 
+runtest-wrench: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
+       @failed=0; \
+       passed=0; \
+       failed_tests="";\
+       for i in $(TESTSI_CS) $(TESTBS) $(TESTSI_IL); do        \
+               rm -f $${i}.so; \
+               if [ x$(AOT) = x1 ]; then if echo $(AOT_DISABLED_TESTS) | grep -v -q $${i}; then $(with_mono_path) $(JITTEST_PROG_RUN) --aot --debug $${i} > $${i}.aotlog 2>&1 || exit 1; fi; fi; \
+               if $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$i '$(DISABLED_TESTS_WRENCH)' $(RUNTIME_ARGS); \
+               then \
+                       passed=`expr $${passed} + 1`; \
+               else \
+                       if [ $$? = 2 ]; then break; fi; \
+                       failed=`expr $${failed} + 1`; \
+                       failed_tests="$${failed_tests} $$i"; \
+               fi \
+       done; \
+       echo "$${passed} test(s) passed. $${failed} test(s) did not pass."; \
+       if [ $${failed} != 0 ]; then echo -e "\nFailed tests:\n"; \
+         for i in $${failed_tests}; do echo $${i}; done; exit 1; fi
+
+runtest-managed-wrench: test-runner.exe $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
+       @$(RUNTIME) ./test-runner.exe -j a --disabled '$(DISABLED_TESTS_WRENCH)' $(TESTSI_CS) $(TESTBS) $(TESTSI_IL)
+
+testjit-wrench:
+       @if test x$(M) != x; then $(MAKE) runtest-managed-wrench; else $(MAKE) runtest-wrench; fi
+
 runtest: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
        @failed=0; \
        passed=0; \