[tests] update 'make testinterp' target
authorBernhard Urban <bernhard.urban@xamarin.com>
Mon, 13 Mar 2017 16:39:57 +0000 (17:39 +0100)
committerBernhard Urban <bernhard.urban@xamarin.com>
Mon, 13 Mar 2017 16:41:31 +0000 (17:41 +0100)
mono/tests/Makefile.am

index aef891ca9533761070e528971ea22de4574a4caf..3ced39a0cdd0326ebe3e6f19fa126bf0f12c676b 100644 (file)
@@ -19,13 +19,11 @@ test-wrench: check-parallel
 
 aotcheck: testaot gshared-aot
 
-TEST_PROG = ../interpreter/mint
-
 JITTEST_PROG = $(if $(VALGRIND), valgrind $(VALGRIND_ARGS),) $(if $(SGEN),$(top_builddir)/mono/mini/mono-sgen,$(top_builddir)/mono/mini/mono)
 
-TEST_PROG_RUN = MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(TEST_PROG)
 JITTEST_PROG_RUN = MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(JITTEST_PROG)
 
+
 RUNTIME_ARGS=--config tests-config --optimize=all --debug
 
 if HOST_WIN32
@@ -889,14 +887,17 @@ LLVM = $(filter --llvm, $(MONO_ENV_OPTIONS))
 # bug-Xamarin-5278.exe got broken by 5d26590e79da139a284459299aee95c25f4cd835
 # bug-45841-fpstack-exceptions.exe: https://bugzilla.xamarin.com/show_bug.cgi?id=47053
 # appdomain-thread-abort.exe: https://bugzilla.xamarin.com/show_bug.cgi?id=47054
-DISABLED_TESTS=                        \
+KNOWN_FAILING_TESTS = \
        delegate-async-exception.exe    \
        bug-348522.2.exe        \
        bug-459094.exe \
        delegate-invoke.exe \
        bug-Xamarin-5278.exe \
        bug-45841-fpstack-exceptions.exe \
-       appdomain-thread-abort.exe \
+       appdomain-thread-abort.exe
+
+DISABLED_TESTS = \
+       $(KNOWN_FAILING_TESTS) \
        $(PLATFORM_DISABLED_TESTS) \
        $(EXTRA_DISABLED_TESTS) \
        $(COOP_DISABLED_TESTS) \
@@ -906,6 +907,166 @@ DISABLED_TESTS=                   \
        $(if $(CI_PR),$CI_PR_DISABLED_TESTS) \
        $(if $(LLVM),$(LLVM_DISABLED_TESTS))
 
+INTERP_DISABLED_TESTS = \
+       $(CI_PR_DISABLED_TESTS) \
+       $(CI_DISABLED_TESTS) \
+       $(KNOWN_FAILING_TESTS) \
+       abort-cctor.exe \
+       appdomain-async-invoke.exe \
+       appdomain-exit.exe \
+       appdomain-unload-callback.exe \
+       appdomain-unload-doesnot-raise-pending-events.exe \
+       appdomain-unload.exe \
+       appdomain.exe \
+       appdomain1.exe \
+       appdomain2.exe \
+       array_load_exception.exe \
+       assembly_append_ordering.exe \
+       assemblyresolve_event4.exe \
+       async-exc-compilation.exe \
+       async-with-cb-throws.exe \
+       async_read.exe \
+       bug-10127.exe \
+       bug-18026.exe \
+       bug-27147.exe \
+       bug-2907.exe \
+       bug-323114.exe \
+       bug-327438.2.exe \
+       bug-335131.2.exe \
+       bug-349190.2.exe \
+       bug-415577.exe \
+       bug-461867.exe \
+       bug-461941.exe \
+       bug-46661.exe \
+       bug-47295.exe \
+       bug-48015.exe \
+       bug-508538.exe \
+       bug-544446.exe \
+       bug-685908.exe \
+       bug-70561.exe \
+       bug-78549.exe \
+       bug-80307.exe \
+       bug-80392.2.exe \
+       bug-81673.exe \
+       bug-81691.exe \
+       bug-82022.exe \
+       bug445361.exe \
+       bug469742.2.exe \
+       call_missing_class.exe \
+       call_missing_method.exe \
+       calliGenericTest.exe \
+       cattr-field.exe \
+       classinit3.exe \
+       cominterop.exe \
+       constant-division.exe \
+       context-static.exe \
+       cross-domain.exe \
+       delegate-async-exit.exe \
+       delegate-delegate-exit.exe \
+       delegate-exit.exe \
+       delegate-with-null-target.exe \
+       delegate.exe \
+       delegate1.exe \
+       delegate3.exe \
+       delegate5.exe \
+       delegate7.exe \
+       delegate8.exe \
+       delegate9.exe \
+       dynamic-method-access.2.exe \
+       dynamic-method-finalize.2.exe \
+       dynamic-method-resurrection.exe \
+       dynamic-method-stack-traces.exe \
+       enum.exe \
+       even-odd.exe \
+       exception18.exe \
+       field-access.exe \
+       finally_block_ending_in_dead_bb.exe \
+       gc-altstack.exe \
+       gchandles.exe \
+       generic-marshalbyref.2.exe \
+       generic-mkrefany.2.exe \
+       generic-refanyval.2.exe \
+       generic-stack-traces2.2.exe \
+       generic-type-load-exception.2.exe \
+       generic-unloading.2.exe \
+       generics-invoke-byref.2.exe \
+       generics-sharing.2.exe \
+       handleref.exe \
+       invalid-token.exe \
+       invalid_generic_instantiation.exe \
+       invoke-string-ctors.exe \
+       invoke.exe \
+       ldfld_missing_class.exe \
+       ldfld_missing_field.exe \
+       ldftn-access.exe \
+       loader.exe \
+       marshal-valuetypes.exe \
+       marshal.exe \
+       marshal2.exe \
+       marshal8.exe \
+       marshal9.exe \
+       marshalbool.exe \
+       main-returns-background-change.exe \
+       method-access.exe \
+       modules.exe \
+       monitor-abort.exe \
+       monitor-wait-abort.exe \
+       monitor.exe \
+       namedmutex-destroy-race.exe \
+       nullable_boxing.2.exe \
+       pinvoke-2.2.exe \
+       pinvoke-utf8.exe \
+       pinvoke.exe \
+       pinvoke11.exe \
+       pinvoke17.exe \
+       pinvoke2.exe \
+       pinvoke3.exe \
+       pinvoke_ppcc.exe \
+       pinvoke_ppcd.exe \
+       pinvoke_ppcf.exe \
+       pinvoke_ppci.exe \
+       pinvoke_ppcs.exe \
+       priority.exe \
+       process-unref-race.exe \
+       reference-loader.exe \
+       reload-at-bb-end.exe \
+       remoting1.exe \
+       remoting2.exe \
+       remoting3.exe \
+       remoting4.exe \
+       remoting5.exe \
+       runtime-invoke.exe \
+       runtime-invoke.gen.exe \
+       safehandle.2.exe \
+       shared-generic-synchronized.2.exe \
+       sleep.exe \
+       stackframes-async.2.exe \
+       static-constructor.exe \
+       test-inline-call-stack.exe \
+       test-tls.exe \
+       test-type-ctor.exe \
+       thread-exit.exe \
+       thread6.exe \
+       threadpool-exceptions1.exe \
+       threadpool-exceptions2.exe \
+       threadpool-exceptions3.exe \
+       threadpool-exceptions4.exe \
+       threadpool-exceptions5.exe \
+       threadpool-exceptions6.exe \
+       threadpool-exceptions7.exe \
+       threadpool.exe \
+       threadpool1.exe \
+       thunks.exe \
+       transparentproxy.exe \
+       typeload-unaligned.exe \
+       unload-appdomain-on-shutdown.exe \
+       vararg.exe \
+       vararg.exe \
+       vararg2.exe \
+       vt-sync-method.exe \
+       winx64structs.exe \
+       xdomain-threads.exe
+
 # pre-requisite test sources: files that are not test themselves
 # but that need to be compiled
 PREREQ_IL_SRC=event-il.il module-cctor.il
@@ -1069,42 +1230,6 @@ assemblyresolve/test/asm.dll:
 TestDriver.dll:
        $(MCS) -target:library -out:$@ $(srcdir)/../mini/TestDriver.cs $(srcdir)/../mini/TestHelpers.cs
 
-test_cs: $(TEST_PROG) $(TESTSI_CS) libtest.la
-       @failed=0; \
-       passed=0; \
-       if [ "x$$V" = "x1" ]; then dump_action="dump-output"; else dump_action="no-dump"; fi; \
-       for i in $(TESTSI_CS); do       \
-               if $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" "$${dump_action}" $(RUNTIME_ARGS); \
-               then \
-                       passed=`expr $${passed} + 1`; \
-               else \
-                       if [ $$? = 2 ]; then break; fi; \
-                       failed=`expr $${failed} + 1`; \
-               fi \
-       done; \
-       echo; echo ".cs: $${passed} test(s) passed. $${failed} test(s) did not pass."; echo
-
-test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
-       @failed=0; \
-       passed=0; \
-       if [ "x$$V" = "x1" ]; then dump_action="dump-output"; else dump_action="no-dump"; fi; \
-       for i in $(TESTSI_IL); do       \
-               if $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" "$${dump_action}" $(RUNTIME_ARGS); \
-               then \
-                       passed=`expr $${passed} + 1`; \
-               else \
-                       if [ $$? = 2 ]; then break; fi; \
-                       failed=`expr $${failed} + 1`; \
-               fi \
-       done; \
-       echo; echo ".il: $${passed} test(s) passed. $${failed} test(s) did not pass."; echo
-
-testb: $(TEST_PROG) $(TESTBS)
-       if [ "x$$V" = "x1" ]; then dump_action="dump-output"; else dump_action="no-dump"; fi; \
-       for i in $(TESTBS); do  \
-               $(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" "$${dump_action}" $(RUNTIME_ARGS);   \
-       done
-
 runtest: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
        @failed=0; \
        passed=0; \
@@ -1153,8 +1278,8 @@ testaot:
 testtrace:
        @$(MAKE) RUNTIME_ARGS="$${RUNTIME_ARGS} --trace" runtest
 
-testinterp:
-       @$(MAKE) JITTEST_PROG_RUN="$(TEST_PROG_RUN)" runtest
+testinterp: test-runner.exe $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
+       $(TOOLS_RUNTIME) --debug $(TEST_RUNNER) $(TEST_RUNNER_ARGS) -j a --runtime-args "--interpreter" --testsuite-name "runtime-interp" --timeout 300 --disabled "$(INTERP_DISABLED_TESTS)" $(TESTSI_CS) $(TESTBS) $(TESTSI_IL)
 
 testjitspeed: $(JITTEST_PROG) $(TESTBS)
        for i in $(TESTBS); do  \