X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2FMakefile.am;h=d6f4c3178862a14cfcdde0ca410e5719866e3858;hb=1e726ce7a38a92860acab28f4427813d2ba14c13;hp=bb84617307cd3a11182c283ac80f60f207b1a77a;hpb=5157b11ed11074c41ecb976082cdfa0e707c77b4;p=mono.git diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index bb84617307c..d6f4c317886 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = cas assemblyresolve +SUBDIRS = cas assemblyresolve gc-descriptors check-local: test @@ -44,6 +44,7 @@ STRESS_TESTS_SRC= \ # Disabled until ?mcs is fixed # bug-331958.cs BASE_TEST_CS_SRC= \ + bug-2907.cs \ array-init.cs \ arraylist.cs \ assemblyresolve_event.cs \ @@ -229,6 +230,7 @@ BASE_TEST_CS_SRC= \ bug-78656.cs \ bug-77127.cs \ bug-323114.cs \ + bug-Xamarin-5278.cs \ interlocked.cs \ cross-domain.cs \ appdomain-exit.cs \ @@ -358,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 \ @@ -383,7 +383,12 @@ BASE_TEST_CS_SRC= \ mono-path.cs \ bug-bxc-795.cs \ bug-3903.cs \ - async-with-cb-throws.cs + async-with-cb-throws.cs \ + appdomain-unload-doesnot-raise-pending-events.cs \ + bug-6148.cs \ + assembly_append_ordering.cs \ + bug-10127.cs \ + allow-synchronous-major.cs TEST_CS_SRC_DIST= \ $(BASE_TEST_CS_SRC) \ @@ -441,21 +446,99 @@ PLATFORM_DISABLED_TESTS=dynamic-method-resurrection.exe #PLATFORM_DISABLED_TESTS=dynamic-method-resurrection.exe exception17.exe endif +if NACL_CODEGEN +# Tests that use Thread.Abort() +PLATFORM_DISABLED_TESTS= abort-stress-1.exe \ + abort-stress-2.exe \ + abort-stress-3.exe \ + appdomain-thread-abort.exe \ + async-exc-compilation.exe \ + bug-561239.exe \ + bug-70561.exe \ + finalizer-abort.exe \ + finally_guard.exe \ + main-returns-abort-resetabort.exe \ + main-returns-background-abort-resetabort.exe \ + thread6.exe \ + threadpool-exceptions5.exe \ + threadpool-exceptions6.exe + +# Tests that rely on AppDomain.Unload +PLATFORM_DISABLED_TESTS+= appdomain-async-invoke.exe \ + appdomain-exit.exe \ + appdomain-unload-callback.exe \ + appdomain-unload.exe \ + domain-stress.exe \ + generic-unloading.2.exe \ + monitor.exe \ + remoting4.exe \ + threadpool-exceptions7.exe \ + xdomain-threads.exe + +# pinvoke2 attaches a thread to the runtime, but +# doesn't 'unattach' it and it hangs in GC on exit +PLATFORM_DISABLED_TESTS+= pinvoke2.exe + +# Tests that currently hang waiting for non-main threads +# to exit in NaCl, need to investigate. Most are AppDomain +# creation and Delegate tests. +PLATFORM_DISABLED_TESTS+= appdomain1.exe \ + delegate9.exe \ + marshal-valuetypes.exe \ + cross-domain.exe \ + stackframes-async.2.exe \ + generic-marshalbyref.2.exe \ + generic-xdomain.2.exe \ + bug-415577.exe + +# Tests that fail trying to write files (appdomain create mostly) +PLATFORM_DISABLED_TESTS+= bug-335131.2.exe \ + bug-349190.2.exe \ + bug-80307.exe \ + bug-462592.exe + +# FIXME: don't know why delegate2.exe fails, it shouldn't +PLATFORM_DISABLED_TESTS+= delegate2.exe + +# These tests newly fail with the latest revision. pinvoke3 fails because +# of a thread attach, the others have not been investigated. TODO revisit. +PLATFORM_DISABLED_TESTS+= pinvoke3.exe \ + async_read.exe \ + async-with-cb-throws.exe \ + appdomain-unload-doesnot-raise-pending-events.exe \ + gsharing-valuetype-layout.exe + +if X86 +# FIXME: There are problems with async callbacks and results on NaCl 32-bit +PLATFORM_DISABLED_TESTS+= delegate1.exe \ + delegate3.exe \ + delegate5.exe \ + delegate8.exe \ + threadpool.exe \ + threadpool1.exe \ + threadpool-exceptions3.exe \ + bug-323114.exe \ + delegate-exit.exe \ + bug-80392.2.exe + +# FIXME: These tests hang/fail for unknown reasons, deal with exiting +PLATFORM_DISABLED_TESTS+= main-returns-background-resetabort.exe \ + main-returns-background.exe \ + main-returns-background-change.exe +endif + +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 # delegate-invoke.exe depends on 929c6bc9b6d76a273f251e6f5dfacac36e9c38bd which was # reverted. -# generic_type_definition.2.exe depends on COMPILER_ACCESS which is no longer supported. DISABLED_TESTS= \ delegate-async-exception.exe \ bug-348522.2.exe \ - finalizer-wait.exe \ - critical-finalizers.exe \ - gc-altstack.exe \ bug-459094.exe \ delegate-invoke.exe \ - generic_type_definition.2.exe \ $(PLATFORM_DISABLED_TESTS) DISABLED_TESTS_WRENCH= \ @@ -544,7 +627,10 @@ TEST_IL_SRC= \ bug-515884.il \ bug-633291.il \ delegate-with-null-target.il \ - bug-318677.il + bug-318677.il \ + gsharing-valuetype-layout.il \ + invalid_generic_instantiation.il + # pre-requisite test sources: files that are not test themselves # but that need to be compiled @@ -598,17 +684,25 @@ tests: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_ # Test that no symbols are missed in eglib-remap.h # OK_G_SYMBOLS='g_list\|g_slist\|g_concat_dir_and_file' +if NACL_CODEGEN +test-eglib-remap: +else test-eglib-remap: @echo "Testing eglib remap..." @if which nm > /dev/null; then if nm $(top_builddir)/mono/mini/mono | grep -v $(OK_G_SYMBOLS) | grep 't g_'; then exit 1; else exit 0; fi; fi +endif # # Tests that the internals in mono/io-layer/messages.c are ok by triggering the # code that checks that the table is properly sorted # +if NACL_CODEGEN +test-messages: +else test-messages: w32message.exe > test_messages.zero $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout +endif if MOONLIGHT test_2_1 : test-coreclr-security @@ -632,7 +726,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 @@ -650,7 +744,7 @@ test_cs: $(TEST_PROG) $(TESTSI_CS) libtest.la @failed=0; \ passed=0; \ for i in $(TESTSI_CS); do \ - if $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \ + if $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' 'no-dump' $(RUNTIME_ARGS); \ then \ passed=`expr $${passed} + 1`; \ else \ @@ -664,7 +758,7 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la @failed=0; \ passed=0; \ for i in $(TESTSI_IL); do \ - if $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \ + if $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" 'no-dump' $(RUNTIME_ARGS); \ then \ passed=`expr $${passed} + 1`; \ else \ @@ -676,7 +770,7 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la testb: $(TEST_PROG) $(TESTBS) for i in $(TESTBS); do \ - $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \ + $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' 'no-dump' $(RUNTIME_ARGS); \ done runtest-wrench: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS) @@ -686,7 +780,7 @@ runtest-wrench: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $( 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); \ + if $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$i '$(DISABLED_TESTS_WRENCH)' 'dump-output' $(RUNTIME_ARGS); \ then \ passed=`expr $${passed} + 1`; \ else \ @@ -712,7 +806,7 @@ runtest: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQS 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)' $(RUNTIME_ARGS); \ + if $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' 'no-dump' $(RUNTIME_ARGS); \ then \ passed=`expr $${passed} + 1`; \ else \ @@ -785,33 +879,85 @@ 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 +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 = SGEN_TESTS = \ + finalizer-wait.exe \ + critical-finalizers.exe \ sgen-descriptors.exe \ - sgen-gshared-vtype.exe + sgen-gshared-vtype.exe \ + sgen-domain-unload.exe \ + sgen-weakref-stress.exe \ + sgen-cementing-stress.exe \ + sgen-case-23400.exe + +SGEN_CONFIGURATIONS = \ + "|plain" \ + "major=marksweep-par|ms-par" \ + "major=marksweep-conc|ms-conc" \ + "major=marksweep-conc,minor=split|ms-conc-split" \ + "minor=split|ms-split" \ + "minor=split,alloc-ratio=95|ms-split-95" + +#FIXME We should move to use SGEN_CONFIGURATIONS once sgen supports trailling commas or its argument list. +SGEN_BRIDGE_CONFIGURATIONS = \ + "|plain" \ + ",major=marksweep-conc|ms-conc" \ + ",minor=split|ms-split" 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 2> $$fn.stderr || exit 1; \ - MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - MONO_GC_PARAMS=major=marksweep-par,minor=split MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - MONO_GC_PARAMS=minor=split MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - MONO_GC_PARAMS=major=marksweep,concurrent-sweep MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - MONO_GC_PARAMS=minor=split,major=marksweep,concurrent-sweep MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - MONO_GC_PARAMS=major=marksweep-par,minor=split,alloc-ratio=95 MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - MONO_GC_PARAMS=minor=split,alloc-ratio=95 MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) $$fn > $$fn.stdout 2> $$fn.stderr || exit 1; \ - done + @failed=0; \ + passed=0; \ + failed_tests="";\ + for test in $+; do \ + echo "...$$test"; \ + for conf in $(SGEN_CONFIGURATIONS); do \ + name=`echo $$conf | cut -d\| -f 2`; \ + params=`echo $$conf | cut -d\| -f 1`; \ + test_name="$${test}|$${name}"; \ + if MONO_GC_PARAMS="$$params" MONO_ENV_OPTIONS="--gc=sgen" $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$test_name "$(DISABLED_TESTS_SGEN)" 'dump-output' $(RUNTIME_ARGS); \ + then \ + passed=`expr $${passed} + 1`; \ + else \ + if [ $$? = 2 ]; then break; fi; \ + failed=`expr $${failed} + 1`; \ + failed_tests="$${failed_tests} $$test_name"; \ + fi \ + done \ + 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 +sgen-bridge-tests: sgen-bridge.exe sgen-bridge-major-fragmentation.exe + @failed=0; \ + passed=0; \ + failed_tests="";\ + for test in $+; do \ + echo "...$$test"; \ + for conf in $(SGEN_BRIDGE_CONFIGURATIONS); do \ + name=`echo $$conf | cut -d\| -f 2`; \ + params=`echo $$conf | cut -d\| -f 1`; \ + test_name="$${test}|$${name}"; \ + if MONO_GC_PARAMS="bridge=Bridge$${params}" MONO_ENV_OPTIONS="--gc=sgen" $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$test_name "$(DISABLED_TESTS_SGEN)" 'dump-output' $(RUNTIME_ARGS); \ + then \ + passed=`expr $${passed} + 1`; \ + else \ + if [ $$? = 2 ]; then break; fi; \ + failed=`expr $${failed} + 1`; \ + failed_tests="$${failed_tests} $$test_name"; \ + fi \ + done \ + 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 -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 || exit 1; \ - MONO_GC_PARAMS=bridge=Bridge,minor=split MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) sgen-bridge.exe > sgen-bridge.exe.stdout 2> sgen-bridge.exe.stderr || exit 1; \ - 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 || exit 1; \ - MONO_GC_PARAMS=bridge=Bridge,minor=split MONO_ENV_OPTIONS="--gc=sgen" $(RUNTIME) sgen-bridge-major-fragmentation.exe > sgen-bridge-major-fragmentation.exe.stdout 2> sgen-bridge-major-fragmentation.exe.stderr || exit 1; +sgen-tests: sgen-regular-tests sgen-bridge-tests # Generated tests for runtime invoke @@ -986,8 +1132,12 @@ test-generic-sharing-normal: $(GSHARED_TESTS) test-generic-sharing-managed: test-runner.exe $(GSHARED_TESTS) @$(RUNTIME) ./test-runner.exe -j a --opt-sets "gshared gshared,shared gshared,-inline gshared,-inline,shared" $(GSHARED_TESTS) +if NACL_CODEGEN +test-generic-sharing: +else test-generic-sharing: @if test x$(M) != x; then $(MAKE) test-generic-sharing-managed; else $(MAKE) test-generic-sharing-normal; fi +endif EXTRA_DIST += async-exceptions.cs async-exceptions.exe : async-exceptions.cs @@ -1009,12 +1159,21 @@ patch-libtool: sed -e 's,LIBTOOL =,LIBTOOL2 =,g' Makefile > 2 && echo "LIBTOOL = bash ./libtool" > 1 && cat 1 2 > Makefile touch libtest.c -EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected + +if NACL_CODEGEN +test-process-exit: +else +EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected test-process-exit: @$(MCS) $(srcdir)/bug-438454.cs -out:bug-438454.exe @echo "Testing bug-438454.exe..." @$(RUNTIME) bug-438454.exe > bug-438454.exe.stdout @diff -w bug-438454.exe.stdout $(srcdir)/bug-438454.exe.stdout.expected + @$(MCS) $(srcdir)/threadpool-in-processexit.cs -out:threadpool-in-processexit.exe + @echo "Testing threadpool-in-processexit.exe..." + @$(RUNTIME) threadpool-in-processexit.exe > threadpool-in-processexit.exe.stdout + @diff -w threadpool-in-processexit.exe.stdout $(srcdir)/threadpool-in-processexit.exe.stdout.expected +endif OOM_TESTS = \ gc-oom-handling.exe \ @@ -1032,7 +1191,7 @@ test-oom: $(OOM_TESTS) noinst_LTLIBRARIES = libtest.la -INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) +AM_CPPFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) if HOST_WIN32 # gcc-3.4.4 emits incorrect code when making indirect calls to stdcall functions using a tail call