Merge pull request #3144 from Unity-Technologies/fix-recursive-property-call

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

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 236d39a6b64cd4d7fe0181d312f2c7e638b6d614..b3b5c34c0fd7a4ffd9d3425114d7f759ffa2d8f1 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -585,6 +585,12 @@ endif
 
 endif
 
+if ENABLE_COOP
+COOP_DISABLED_TESTS= thunks.exe
+else
+COOP_DISABLED_TESTS= 
+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
@@ -598,7 +604,8 @@ DISABLED_TESTS=                     \
        delegate-invoke.exe \
        bug-Xamarin-5278.exe \
        $(PLATFORM_DISABLED_TESTS) \
-       $(EXTRA_DISABLED_TESTS)
+       $(EXTRA_DISABLED_TESTS) \
+       $(COOP_DISABLED_TESTS)
 
 DISABLED_TESTS_WRENCH= \
        $(DISABLED_TESTS)       \
@@ -768,25 +775,7 @@ endif
 test-env-options:
        MONO_ENV_OPTIONS="--version" $(RUNTIME) array-init.exe | grep -q Architecture:
 
-if AMD64
-test-sgen : sgen-tests
-else
-if X86
-if HOST_WIN32
-test-sgen :
-else
-test-sgen : sgen-tests
-endif
-else
-if ARM
 test-sgen : sgen-tests
-else
-if S390X
-test-sgen : sgen-regular-tests
-endif
-endif
-endif
-endif
 
 # Precompile the test assemblies in parallel
 compile-tests:
@@ -969,9 +958,11 @@ EXTRA_DIST += sgen-bridge.cs sgen-descriptors.cs sgen-gshared-vtype.cs sgen-brid
 
 sgen-tests:
        $(MAKE) sgen-regular-tests
+if !S390X
        $(MAKE) sgen-toggleref-tests
        $(MAKE) sgen-bridge-tests
        $(MAKE) sgen-bridge2-tests
+endif
 
 SGEN_REGULAR_TESTS =   \
        finalizer-wait.exe      \