X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2FMakefile.am;h=4440f9f64c88f4e1f18ef7d642904274d17f0f41;hb=bd35146902473493b1fc9a51fa9cf9c8ad63a574;hp=adc4d20ad63cb52a6c06a4cf441d54442732d314;hpb=93ee804e3fb98973c67a8e889da8459973014e6a;p=mono.git diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index adc4d20ad63..4440f9f64c8 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -40,7 +40,7 @@ STRESS_TESTS_SRC= \ thread-stress.cs \ gc-stress.cs -TEST_CS_SRC= \ +BASE_TEST_CS_SRC= \ array-init.cs \ arraylist.cs \ assemblyresolve_event.cs \ @@ -167,7 +167,6 @@ TEST_CS_SRC= \ remoting3.cs \ remoting4.cs \ remoting5.cs \ - nonvirt.cs \ largeexp.cs \ largeexp2.cs \ marshalbyref1.cs \ @@ -215,6 +214,7 @@ TEST_CS_SRC= \ bug-78653.cs \ bug-78656.cs \ bug-77127.cs \ + bug-323114.cs \ bug-331958.cs \ interlocked.cs \ cross-domain.cs \ @@ -238,7 +238,25 @@ TEST_CS_SRC= \ exists.cs \ handleref.cs \ transparentproxy.cs \ - imt_big_iface_test.cs + imt_big_iface_test.cs \ + dbnull-missing.cs \ + test-type-ctor.cs \ + soft-float-tests.cs \ + thread-exit.cs + +if AMD64 +TEST_CS_SRC = $(BASE_TEST_CS_SRC) async-exc-compilation.cs +else +if X86 +TEST_CS_SRC = $(BASE_TEST_CS_SRC) async-exc-compilation.cs +else +TEST_CS_SRC = $(BASE_TEST_CS_SRC) +endif +endif + +if IA64 +TEST_CS_SRC+=async-exc-compilation.cs +endif if X86 # bug #71274 @@ -254,6 +272,8 @@ DISABLED_TESTS= \ delegate-async-exception.exe \ delegate-delegate-exception.exe \ appdomain-unload.exe \ + bug-77127.exe \ + bug-348522.exe \ $(PLATFORM_DISABLED_TESTS) # These only compile with MS CSC @@ -284,7 +304,10 @@ TEST_IL_SRC= \ even-odd.il \ bug-82022.il \ vt-sync-method.il \ - enum_types.il + enum_types.il \ + invalid-token.il + +# bug-318677.il TEST_CS2_SRC = \ assemblyresolve_event2.2.cs \ @@ -305,11 +328,15 @@ TEST_CS2_SRC = \ bug-82194.2.cs \ anonarray.2.cs \ ienumerator-interfaces.2.cs \ + array-enumerator-ifaces.2.cs \ generic_type_definition_encoding.2.cs \ generic_type_definition.2.cs \ bug-333798.2.cs \ bug-333798-tb.2.cs \ - bug-335131.2.cs + bug-335131.2.cs \ + bug-322722_patch_bx.2.cs \ + bug-348522.2.cs \ + bug-322722_dyn_method_throw.2.cs TEST_IL2_SRC = find-method.2.il \ bug-79215.2.il \ @@ -350,14 +377,14 @@ EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_CS2_SRC) $(TEST_IL_SRC) $(TEST_IL2_ # mkbundle works on ppc, but the pkg-config POC doesn't when run with make test if POWERPC -test: assemblyresolve/test/asm.dll testjit test-type-load test-inline-call-stack test-bug-80307 test-bug-81673 test-bug-81691 test-bug-81466 +test: assemblyresolve/test/asm.dll testjit test-type-load test-inline-call-stack test-bug-80307 test-bug-81673 test-bug-81691 test-bug-81466 test-bug-324535 else # Can't use mkbundle on win32 since there is no static build there # Can't run test-unhandled-exception on Windows because of all the debug popups... if PLATFORM_WIN32 -test: assemblyresolve/test/asm.dll testjit test-type-load test-inline-call-stack test-bug-80307 test-bug-81673 test-bug-81691 test-bug-81466 +test: assemblyresolve/test/asm.dll testjit test-type-load test-inline-call-stack test-bug-80307 test-bug-81673 test-bug-81691 test-bug-81466 test-bug-324535 else -test: assemblyresolve/test/asm.dll testjit testbundle test-type-load test-inline-call-stack test-iomap-regression test-bug-80307 test-bug-81673 test-bug-81691 test-bug-81466 +test: assemblyresolve/test/asm.dll testjit testbundle test-type-load test-inline-call-stack test-iomap-regression test-bug-80307 test-bug-81673 test-bug-81691 test-bug-81466 test-bug-324535 custom-modifiers endif endif @@ -446,7 +473,9 @@ testjit-net_2_0: $(TESTSI_CS2) $(TESTSI_IL2) libtest.la if [ $${failed} != 0 ]; then echo -e "\nFailed tests:\n"; \ for i in $${failed_tests}; do echo $${i}; done; exit 1; fi -testaot: $(TESTSI_CS) $(TESTBS) libtest.la +testaot: testaot-default testaot-net_2_0 + +testaot-default: $(TESTSI_CS) $(TESTBS) libtest.la @failed=0; \ passed=0; \ failed_tests="";\ @@ -467,6 +496,26 @@ testaot: $(TESTSI_CS) $(TESTBS) libtest.la if [ $$failed != 0 ]; then echo -e "\nFailed tests:\n"; \ for i in $${failed_tests}; do echo $${i}; done; exit 1; fi +testaot-net_2_0: $(TESTSI_CS2) $(TESTSI_IL2) libtest.la + @failed=0; \ + passed=0; \ + failed_tests="";\ + for i in $(TESTSI_CS2) $(TESTSI_IL2); do \ + rm -f $${i}.so; \ + $(JITTEST_PROG_RUN) --aot $${i} > /dev/null; \ + if $(srcdir)/test-driver '$(with_mono_path2) $(JITTEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \ + then \ + passed=`expr $${passed} + 1`; \ + else \ + if [ $$? = 2 ]; then break; fi; \ + failed=`expr $${failed} + 1`; \ + failed_tests="$${failed_tests} $$i"; \ + fi \ + 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 + testtrace: $(MAKE) RUNTIME_ARGS="$${RUNTIME_ARGS} --trace" testjit @@ -604,10 +653,26 @@ bug-81466.exe: bug-81466.il bug-81466-lib.dll test-bug-81466: bug-81466.exe bug-81466-lib.dll $(RUNTIME) bug-81466.exe +EXTRA_DIST += bug-324535-il.il bug-324535.cs +bug-324535-il.dll : bug-324535-il.il + $(ILASM) /dll /output:bug-324535-il.dll $(srcdir)/bug-324535-il.il +bug-324535.exe : bug-324535.cs bug-324535-il.dll + $(MCS) -r:bug-324535-il.dll -out:bug-324535.exe $(srcdir)/bug-324535.cs +test-bug-324535 : bug-324535.exe bug-324535-il.dll + $(RUNTIME) bug-324535.exe + EXTRA_DIST += make_imt_test.sh imt_big_iface_test.cs: $(srcdir)/make_imt_test.sh $(srcdir)/make_imt_test.sh > imt_big_iface_test.cs +EXTRA_DIST += custom-modifiers.2.cs custom-modifiers-lib.il +custom-modifiers-lib.dll: custom-modifiers-lib.il + $(ILASM) /dll /output:custom-modifiers-lib.dll $(srcdir)/custom-modifiers-lib.il +custom-modifiers.exe: custom-modifiers.2.cs custom-modifiers-lib.dll + $(GMCS) -r:custom-modifiers-lib.dll -out:custom-modifiers.exe $(srcdir)/custom-modifiers.2.cs +custom-modifiers: custom-modifiers.exe + $(RUNTIME2) custom-modifiers.exe + EXTRA_DIST += coreclr-security.cs if INSTALL_2_1