X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2FMakefile.am;h=0b3b086a4b1d65cd98a5e18421664df5200bcb6b;hb=010fcfb9ecfef1654b415dbb909a01148a89e827;hp=58b826ef15af98b6039bd5bc4e6f91d0462f49e3;hpb=2dabc3e22196526fb7f052bac6678374f60f3c1d;p=mono.git diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index 58b826ef15a..0b3b086a4b1 100755 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -463,6 +463,7 @@ TESTS_CS_SRC= \ assemblyresolve_event2.2.cs \ appdomain-unload-callback.cs \ appdomain-unload-doesnot-raise-pending-events.cs \ + appdomain-unload-asmload.cs \ unload-appdomain-on-shutdown.cs \ bug-47295.cs \ loader.cs \ @@ -706,92 +707,6 @@ PLATFORM_DISABLED_TESTS += \ sgen-bridge-xref.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 \ - finally_block_ending_in_dead_bb.exe \ - main-returns-abort-resetabort.exe \ - main-returns-background-abort-resetabort.exe \ - thread6.exe \ - threadpool-exceptions5.exe \ - threadpool-exceptions6.exe - -PLATFORM_DISABLED_TESTS+= w32message.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 - if ENABLE_COOP COOP_DISABLED_TESTS= thunks.exe else @@ -866,6 +781,7 @@ PROFILE_DISABLED_TESTS += \ appdomain1.exe \ appdomain2.exe \ appdomain-exit.exe \ + appdomain-unload-asmload.exe \ appdomain-unload-callback.exe \ appdomain-unload-doesnot-raise-pending-events.exe \ unload-appdomain-on-shutdown.exe \ @@ -1016,6 +932,7 @@ INTERP_DISABLED_TESTS = \ appdomain-async-invoke.exe \ appdomain-exit.exe \ appdomain-serialize-exception.exe \ + appdomain-unload-asmload.exe \ appdomain-unload-callback.exe \ appdomain-unload-doesnot-raise-pending-events.exe \ appdomain-unload.exe \ @@ -1218,8 +1135,6 @@ tests: compile-tests # # Test that no symbols are missed in eglib-remap.h # -if NACL_CODEGEN -else if PLATFORM_LINUX test-platform: test-eglib-remap else @@ -1227,7 +1142,6 @@ if PLATFORM_DARWIN test-platform: test-eglib-remap endif endif -endif # The following regexp describes all symbols that start with "g_" but are not part of eglibc. # The optional underscore prepending symbol names may or may not appear depending on the # system and the state of the leading-underscore compiler flag. @@ -1926,12 +1840,8 @@ test-generic-sharing-normal: $(TESTS_GSHARED) $(TESTSAOT_GSHARED) test-generic-sharing-managed: test-runner.exe $(TESTS_GSHARED) $(TESTSAOT_GSHARED) $(Q) $(TOOLS_RUNTIME) $(TEST_RUNNER) -j a --testsuite-name "gshared" --disabled "$(DISABLED_TESTS)" --opt-sets "gshared gshared,shared gshared,-inline gshared,-inline,shared" $(TESTS_GSHARED) -if NACL_CODEGEN -test-generic-sharing: -else test-generic-sharing: @if test x$(M) != x0; 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 @@ -1954,16 +1864,12 @@ patch-libtool: touch libtest.c -if NACL_CODEGEN -test-process-exit: -else EXTRA_DIST += threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected test-process-exit: @$(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 # tests that expect a 1 exit code TESTS_UNHANDLED_EXCEPTION_1_SRC = \