Merge pull request #249 from pcc/xgetinputfocus

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

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 11cf58e33e5a36c482bf0cdaa9059bfea71961d6..971cb1681255a2bfaf276d63fea39f1a1805c60b 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -379,6 +379,7 @@ BASE_TEST_CS_SRC=           \
        bug-696593.cs   \
        bug-705140.cs   \
        bug-1147.cs     \
+       mono-path.cs    \
        bug-bxc-795.cs
 
 TEST_CS_SRC_DIST=      \
@@ -605,6 +606,10 @@ test-sgen : sgen-tests
 else
 if ARM
 test-sgen : sgen-tests
+else
+if S390x
+test-sgen : sgen-regular-tests
+endif
 endif
 endif
 endif
@@ -747,9 +752,9 @@ sgen-regular-tests: $(SGEN_TESTS)
 
 
 sgen-tests: sgen-regular-tests sgen-bridge.exe sgen-bridge-major-fragmentation.exe
-       echo "Testing sgen-bridge.exe ...";     \
+       @echo "Testing sgen-bridge.exe ...";    \
        MONO_GC_PARAMS=bridge=Bridge MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) sgen-bridge.exe > sgen-bridge.exe.stdout 2> sgen-bridge.exe.stderr
-       echo "Testing sgen-bridge-major-fragmentation.exe ..."; \
+       @echo "Testing sgen-bridge-major-fragmentation.exe ...";        \
        MONO_GC_PARAMS=bridge=Bridge MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) sgen-bridge-major-fragmentation.exe > sgen-bridge-major-fragmentation.exe.stdout 2> sgen-bridge-major-fragmentation.exe.stderr