-SUBDIRS = cas
+SUBDIRS = cas assemblyresolve
check-local: test
TEST_PROG = ../interpreter/mint
JITTEST_PROG = ../mini/mono
-TEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime $(LIBTOOL) --mode=execute $(TEST_PROG)
-JITTEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime $(LIBTOOL) --mode=execute $(JITTEST_PROG)
+TEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(TEST_PROG)
+JITTEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mono_build_root)/runtime/etc $(LIBTOOL) --mode=execute $(JITTEST_PROG)
RUNTIME_ARGS=--config tests-config --optimize=all
with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/default
with_mono_path2 = MONO_PATH=$(mcs_topdir)/class/lib/net_2_0
+with_mono_path21 = MONO_PATH=$(mcs_topdir)/class/lib/net_2_1
RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
RUNTIME2 = $(with_mono_path2) $(top_builddir)/runtime/mono-wrapper
+RUNTIME21 = $(with_mono_path21) $(top_builddir)/runtime/mono-wrapper
MKBUNDLE = \
PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
MCS = $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
GMCS = $(RUNTIME2) $(mcs_topdir)/class/lib/net_2_0/gmcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
+SMCS = $(RUNTIME21) $(mcs_topdir)/class/lib/net_2_1/smcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
ILASM = $(RUNTIME) $(mcs_topdir)/class/lib/default/ilasm.exe
ILASM2 = $(RUNTIME2) $(mcs_topdir)/class/lib/net_2_0/ilasm.exe
thread-stress.cs \
gc-stress.cs
-TEST_CS_SRC= \
+BASE_TEST_CS_SRC= \
array-init.cs \
arraylist.cs \
+ assemblyresolve_event.cs \
+ assemblyresolve_event3.cs \
checked.cs \
char-isnumber.cs \
create-instance.cs \
enumcast.cs \
assignable-tests.cs \
array-cast.cs \
+ array-subtype-attr.cs \
cattr-compile.cs \
cattr-field.cs \
cattr-object.cs \
vtype.cs \
isvaluetype.cs \
iface6.cs \
+ iface7.cs \
ipaddress.cs \
array-vt.cs \
interface1.cs \
iface4.cs \
iface-large.cs \
virtual-method.cs \
+ virtual-sync.cs \
intptrcast.cs \
indexer.cs \
stream.cs \
remoting3.cs \
remoting4.cs \
remoting5.cs \
- nonvirt.cs \
largeexp.cs \
largeexp2.cs \
marshalbyref1.cs \
bug-46781.cs \
bug-48015.cs \
bug-42136.cs \
+ bug-59286.cs \
bug-70561.cs \
bug-78311.cs \
bug-78653.cs \
bug-78656.cs \
+ bug-77127.cs \
+ bug-323114.cs \
+ bug-331958.cs \
interlocked.cs \
cross-domain.cs \
appdomain-exit.cs \
main-returns-background-resetabort.cs \
main-returns-background.cs \
main-returns-background-change.cs \
- main-returns.cs \
+ main-returns.cs \
subthread-exit.cs \
- desweak.cs \
- cominterop.cs
+ desweak.cs \
+ cominterop.cs \
+ exists.cs \
+ handleref.cs \
+ transparentproxy.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
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
vararg.cs
TEST_IL_SRC= \
+ field-access.il \
+ method-access.il \
+ ldftn-access.il \
cpblkTest.il \
vbinterface.il \
jmpTest.il \
calliTest.il \
ckfiniteTest.il \
+ fault-handler.il \
locallocTest.il \
+ long-shift-regalloc.il \
initblkTest.il \
qt-instance.il \
vararg.il \
reload-at-bb-end.il \
test-enum-indstoreil.il \
filter-bug.il \
- even-odd.il
+ even-odd.il \
+ bug-82022.il \
+ vt-sync-method.il \
+ enum_types.il \
+ invalid-token.il
+
+# bug-318677.il
TEST_CS2_SRC = \
+ assemblyresolve_event2.2.cs \
interlocked-2.2.cs \
pinvoke-2.2.cs \
+ bug-78431.2.cs \
bug-79684.2.cs \
catch-generics.2.cs \
event-get.2.cs \
- safehandle.2.cs
-
-TEST_IL2_SRC = find-method.2.il
+ safehandle.2.cs \
+ stackframes-async.2.cs \
+ module-cctor-loader.2.cs \
+ generics-invoke-byref.2.cs \
+ generic-signature-compare.2.cs \
+ generics-sharing.2.cs \
+ bug-80392.2.cs \
+ dynamic-method-access.2.cs \
+ 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-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 \
+ bug-79956.2.il \
+ bug-327438.2.il \
+ ldtoken_with_byref_typespec.2.il
# pre-requisite test sources: files that are not test themselves
# but that need to be compiled
-PREREQ_IL_SRC=event-il.il
+PREREQ_IL_SRC=event-il.il module-cctor.il
PREREQ_CS_SRC=
+PREREQ_IL_DLL_SRC=event-il.il module-cctor.il
+PREREQ_CS_DLL_SRC=
PREREQSI_IL=$(PREREQ_IL_SRC:.il=.exe)
PREREQSI_CS=$(PREREQ_CS_SRC:.cs=.exe)
# mkbundle works on ppc, but the pkg-config POC doesn't when run with make test
if POWERPC
-test: testjit test-type-load test-inline-call-stack
+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: testjit test-type-load test-inline-call-stack
+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: testjit testbundle test-type-load test-inline-call-stack
+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
+if INSTALL_2_1
+test : test-coreclr-security
+endif
+
+assemblyresolve/test/asm.dll:
+ $(MAKE) -C assemblyresolve prereq
+
TestDriver.dll:
$(MCS) -target:library -out:$@ $(srcdir)/../mini/TestDriver.cs
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="";\
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
time $(JITTEST_PROG) $$i; \
done
+test-iomap-regression: exists.cs
+ $(MCS) $(srcdir)/exists.cs -out:exists.exe
+ MONO_IOMAP=all $(RUNTIME) exists.exe
+
stresstest: $(STRESS_TESTS)
@failed=0; \
passed=0; \
test-inline-call-stack: TestDriver.dll test-inline-call-stack-library.dll test-inline-call-stack.exe
$(RUNTIME) test-inline-call-stack.exe
+
+EXTRA_DIST += unhandled-exception-base-configuration.config
+EXTRA_DIST += unhandled-exception-legacy-configuration.config
+EXTRA_DIST += unhandled-exception-test-case.2.cs
+EXTRA_DIST += unhandled-exception-test-runner.2.cs
+unhandled-exception-test-case.1.cs: unhandled-exception-test-case.2.cs
+ cp unhandled-exception-test-case.2.cs unhandled-exception-test-case.1.cs
+unhandled-exception-test-case-legacy.1.cs: unhandled-exception-test-case.1.cs
+ cp unhandled-exception-test-case.1.cs unhandled-exception-test-case-legacy.1.cs
+unhandled-exception-test-case-legacy.2.cs: unhandled-exception-test-case.2.cs
+ cp unhandled-exception-test-case.2.cs unhandled-exception-test-case-legacy.2.cs
+unhandled-exception-config_files: unhandled-exception-base-configuration.config unhandled-exception-legacy-configuration.config
+ cp unhandled-exception-base-configuration.config unhandled-exception-test-case.1.exe.config
+ cp unhandled-exception-base-configuration.config unhandled-exception-test-case.2.exe.config
+ cp unhandled-exception-legacy-configuration.config unhandled-exception-test-case-legacy.1.exe.config
+ cp unhandled-exception-legacy-configuration.config unhandled-exception-test-case-legacy.2.exe.config
+unhandled-exception-test-case.1.exe: unhandled-exception-test-case.1.cs
+ $(MCS) /debug unhandled-exception-test-case.1.cs
+unhandled-exception-test-case-legacy.1.exe: unhandled-exception-test-case-legacy.1.cs
+ $(MCS) /debug unhandled-exception-test-case-legacy.1.cs
+unhandled-exception-test-case.2.exe: unhandled-exception-test-case.2.cs
+ $(GMCS) /debug unhandled-exception-test-case.2.cs
+unhandled-exception-test-case-legacy.2.exe: unhandled-exception-test-case-legacy.2.cs
+ $(GMCS) /debug unhandled-exception-test-case-legacy.2.cs
+unhandled-exception-test-runner.2.exe: unhandled-exception-test-runner.2.cs
+ $(GMCS) /debug unhandled-exception-test-runner.2.cs
+
+test-unhandled-exception: unhandled-exception-test-runner.2.exe unhandled-exception-config_files unhandled-exception-test-case.1.exe unhandled-exception-test-case-legacy.1.exe unhandled-exception-test-case.2.exe unhandled-exception-test-case-legacy.2.exe
+ $(RUNTIME) unhandled-exception-test-runner.2.exe RUNTIME:../mini/mono,GTC:F
+
+EXTRA_DIST += bug-80307.cs
+bug-80307.exe: $(srcdir)/bug-80307.cs
+ $(MCS) -r:System.Web -out:$@ $(srcdir)/bug-80307.cs
+
+# We use 'test-support-files' to handle an ordering issue between the 'mono/' and 'runtime/' directories
+test-bug-80307: bug-80307.exe
+ cd $(top_builddir)/runtime && $(MAKE) test-support-files
+ $(RUNTIME) bug-80307.exe
+
+EXTRA_DIST += bug-81673.cs bug-81673-interface.cs
+bug-81673.exe bug-81673-interface.dll: $(srcdir)/bug-81673.cs $(srcdir)/bug-81673-interface.cs
+ $(MCS) -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs
+ $(MCS) -out:bug-81673.exe -r:bug-81673-interface.dll $(srcdir)/bug-81673.cs
+ $(MCS) -define:WITH_STOP -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs
+
+test-bug-81673 : bug-81673.exe bug-81673-interface.dll
+ $(RUNTIME) bug-81673.exe
+
+EXTRA_DIST += bug-81691.cs bug-81691-a.cs bug-81691-b.cs
+bug-81691.exe bug-81691-b.dll: $(srcdir)/bug-81691.cs $(srcdir)/bug-81691-a.cs $(srcdir)/bug-81691-b.cs
+ $(GMCS) -target:library -out:bug-81691-a.dll $(srcdir)/bug-81691-a.cs
+ $(GMCS) -target:library -out:bug-81691-b.dll -r:bug-81691-a.dll $(srcdir)/bug-81691-b.cs
+ $(GMCS) -r:bug-81691-b.dll -out:bug-81691.exe $(srcdir)/bug-81691.cs
+ rm -f bug-81691-a.dll
+
+test-bug-81691 : bug-81691.exe bug-81691-b.dll
+ $(RUNTIME) bug-81691.exe
+
+EXTRA_DIST += bug-81466.il bug-81466-lib.il
+bug-81466-lib.dll: bug-81466-lib.il
+ $(ILASM) /dll /output:bug-81466-lib.dll $(srcdir)/bug-81466-lib.il
+bug-81466.exe: bug-81466.il bug-81466-lib.dll
+ $(ILASM) /exe /output:bug-81466.exe $(srcdir)/bug-81466.il
+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
+coreclr-security.exe : coreclr-security.cs
+ $(SMCS) -out:coreclr-security.exe $(srcdir)/coreclr-security.cs
+
+test-coreclr-security : coreclr-security.exe
+ $(RUNTIME21) --security=core-clr-test coreclr-security.exe
+endif
+
+EXTRA_DIST += async-exceptions.cs
+async-exceptions.exe : async-exceptions.cs
+ $(MCS) -out:async-exceptions.exe $(srcdir)/async-exceptions.cs
+test-async-exceptions : async-exceptions.exe
+ for i in `echo 0 1 2 3 4 5 6 7 8 9 10`; do $(RUNTIME) --inject-async-exc Tests:foo $$i async-exceptions.exe || exit 1; done
+ for i in `echo 0 1 2 3 4 5 6 7 8 9 10`; do $(RUNTIME) --inject-async-exc Tests:bar $$i async-exceptions.exe || exit 1; done
+
# Useful if mono is compiled with --enable-shared=no
patch-libtool:
cp "../../libtool" .
projects / mono.git / blobdiff