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 6d3e1ec5919663804ddaf09776844e32a446715c..971cb1681255a2bfaf276d63fea39f1a1805c60b 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -377,7 +377,10 @@ BASE_TEST_CS_SRC=          \
        sgen-long-vtype.cs      \
        delegate-invoke.cs      \
        bug-696593.cs   \
-       bug-705140.cs
+       bug-705140.cs   \
+       bug-1147.cs     \
+       mono-path.cs    \
+       bug-bxc-795.cs
 
 TEST_CS_SRC_DIST=      \
        $(BASE_TEST_CS_SRC)     \
@@ -595,9 +598,25 @@ else
 test_2_1 :
 endif
 
+if AMD64
+test-sgen : sgen-tests
+else
+if X86
+test-sgen : sgen-tests
+else
+if ARM
+test-sgen : sgen-tests
+else
+if S390x
+test-sgen : sgen-regular-tests
+endif
+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: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test_platform test_2_1 test-process-exit test-sgen
 
 assemblyresolve/test/asm.dll:
        $(MAKE) -C assemblyresolve prereq
@@ -717,6 +736,28 @@ test-type-load: TestDriver.dll
        @echo "Testing load-exception.exe..."
        @$(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_TESTS =   \
+       sgen-descriptors.exe    \
+       sgen-gshared-vtype.exe
+
+sgen-regular-tests: $(SGEN_TESTS)
+       @for fn in $+ ; do      \
+               echo "Testing $$fn ...";        \
+               MONO_GC_PARAMS=major=marksweep-par MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout || exit 1;        \
+               MONO_ENV_OPTIONS="--gc=sgen"                                    $(RUNTIME) $$fn > $$fn.stdout || exit 1;        \
+       done
+
+
+sgen-tests: sgen-regular-tests sgen-bridge.exe sgen-bridge-major-fragmentation.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 ...";        \
+       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
+
+
 # Generated tests for runtime invoke
 EXTRA_DIST += gen-runtime-invoke.cs
 runtime-invoke.gen.exe: TestDriver.dll gen-runtime-invoke.exe
@@ -870,7 +911,8 @@ GSHARED_TESTS = \
                generic-stack-traces.2.exe generic-stack-traces2.2.exe          \
                bug-472600.2.exe bug-473482.2.exe bug-473999.2.exe              \
                bug-479763.2.exe generic-xdomain.2.exe                          \
-               generic-type-load-exception.2.exe bug-616463.exe
+               generic-type-load-exception.2.exe bug-616463.exe        \
+               bug-1147.exe
 
 test-generic-sharing-normal: $(GSHARED_TESTS)
        @for fn in $+ ; do      \