SUBDIRS = cas assemblyresolve
+# avoid including eglib twice since GLIB_LIBS == GMODULE_LIBS for eglib builds
+if EGLIB_BUILD
+glib_libs = $(GLIB_LIBS)
+else
+glib_libs = $(GLIB_LIBS) $(GMODULE_LIBS)
+endif
+
check-local: test
TEST_PROG = ../interpreter/mint
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_path = 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) \
- $(RUNTIME) $(mcs_topdir)/class/lib/default/mkbundle.exe
+ $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/mkbundle.exe
-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
+MCS = $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/gmcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
+SMCS = $(RUNTIME21) --runtime=moonlight --security=temporary-smcs-hack $(mcs_topdir)/class/lib/net_2_1/smcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
+ILASM = $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/ilasm.exe
BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
gchandle-stress.cs \
monitor-stress.cs \
thread-stress.cs \
- gc-stress.cs
+ gc-stress.cs \
+ exit-stress.cs
-TEST_CS_SRC= \
+BASE_TEST_CS_SRC= \
array-init.cs \
arraylist.cs \
assemblyresolve_event.cs \
remoting3.cs \
remoting4.cs \
remoting5.cs \
- nonvirt.cs \
largeexp.cs \
largeexp2.cs \
marshalbyref1.cs \
marshal7.cs \
marshal8.cs \
marshal9.cs \
+ marshal-valuetypes.cs \
test-byval-in-struct.cs \
thread.cs \
thread5.cs \
bug-78653.cs \
bug-78656.cs \
bug-77127.cs \
+ bug-323114.cs \
bug-331958.cs \
interlocked.cs \
cross-domain.cs \
transparentproxy.cs \
imt_big_iface_test.cs \
dbnull-missing.cs \
- soft-float-tests.cs
+ test-type-ctor.cs \
+ soft-float-tests.cs \
+ thread-exit.cs \
+ 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 \
+ stackframes-async.2.cs \
+ module-cctor-loader.2.cs \
+ generics-invoke-byref.2.cs \
+ generic-signature-compare.2.cs \
+ generics-sharing.2.cs \
+ shared-generic-methods.2.cs \
+ shared-generic-synchronized.2.cs \
+ generic-inlining.2.cs \
+ generic-initobj.2.cs \
+ generic-delegate.2.cs \
+ generic-sizeof.2.cs \
+ generic-virtual.2.cs \
+ generic-interface-methods.2.cs \
+ generic-array-type.2.cs \
+ generic-method-patching.2.cs \
+ generic-null-call.2.cs \
+ recursive-generics.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-340662_bug.cs \
+ bug-322722_dyn_method_throw.2.cs \
+ bug-389886-2.cs \
+ bug-325283.2.cs \
+ thunks.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-348522.2.exe \
$(PLATFORM_DISABLED_TESTS)
# These only compile with MS CSC
even-odd.il \
bug-82022.il \
vt-sync-method.il \
- enum_types.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 \
- 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-322722_dyn_method_throw.2.cs
-
-TEST_IL2_SRC = find-method.2.il \
+ enum_types.il \
+ invalid-token.il \
+ call_missing_method.il \
+ call_missing_class.il \
+ ldfld_missing_field.il \
+ ldfld_missing_class.il \
+ find-method.2.il \
bug-79215.2.il \
bug-79956.2.il \
bug-327438.2.il \
- ldtoken_with_byref_typespec.2.il
+ bug-387274.2.il \
+ ldtoken_with_byref_typespec.2.il \
+ resolve_method_bug.2.il \
+ resolve_field_bug.2.il \
+ resolve_type_bug.2.il \
+ generics-sharing-other-exc.2.il \
+ generic-ldobj.2.il \
+ generic-mkrefany.2.il \
+ generic-refanyval.2.il \
+ generic-ldtoken.2.il \
+ generic-ldtoken-method.2.il \
+ generic-ldtoken-field.2.il \
+ generic-tailcall.2.il
+
+# bug-318677.il
# pre-requisite test sources: files that are not test themselves
# but that need to be compiled
PREREQSI_CS=$(PREREQ_CS_SRC:.cs=.exe)
TESTSI_CS=$(TEST_CS_SRC:.cs=.exe)
TESTSI_IL=$(TEST_IL_SRC:.il=.exe)
-TESTSI_CS2=$(TEST_CS2_SRC:.2.cs=.exe)
-TESTSI_IL2=$(TEST_IL2_SRC:.2.il=.exe)
TESTBS=$(BENCHSRC:.cs=.exe)
STRESS_TESTS=$(STRESS_TESTS_SRC:.cs=.exe)
-EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_CS2_SRC) $(TEST_IL_SRC) $(TEST_IL2_SRC) \
+EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC) \
$(BENCHSRC) $(STRESS_TESTS_SRC) stress-runner.pl $(PREREQ_IL_SRC) $(PREREQ_CS_SRC)
-%.exe: %.2.il
- $(ILASM2) -out:$@ $<
-
%.exe: %.il
$(ILASM) -out:$@ $<
-%.exe: %.2.cs TestDriver.dll
- $(GMCS) -r:TestDriver.dll -out:$@ $<
-
%.exe: %.cs TestDriver.dll
$(MCS) -r:TestDriver.dll -out:$@ $<
# 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-bug-324535
+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 test-generic-sharing test-bug-382986
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-bug-324535
+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 test-generic-sharing test-bug-382986
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-bug-324535
+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 test-generic-sharing test-bug-382986
endif
endif
$(srcdir)/test-driver '$(with_mono_path) $(TEST_PROG_RUN)' $$i '$(DISABLED_TESTS)' $(RUNTIME_ARGS); \
done
-testjit: testjit-default testjit-net_2_0
-
-testjit-default: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
+testjit: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
@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
-testjit-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; \
- 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
-
-testaot: testaot-default testaot-net_2_0
-
-testaot-default: $(TESTSI_CS) $(TESTBS) libtest.la
+testaot: $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la
@failed=0; \
passed=0; \
failed_tests="";\
export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
- for i in $(TESTSI_CS) $(TESTBS); do \
+ for i in $(TESTSI_CS) $(TESTSI_IL) $(TESTBS); do \
rm -f $${i}.so; \
$(JITTEST_PROG_RUN) --aot $${i} > /dev/null; \
if $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
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
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
+ $(MCS) /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
+ $(MCS) /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
+ $(MCS) /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-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
+ $(MCS) -target:library -out:bug-81691-a.dll $(srcdir)/bug-81691-a.cs
+ $(MCS) -target:library -out:bug-81691-b.dll -r:bug-81691-a.dll $(srcdir)/bug-81691-b.cs
+ $(MCS) -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
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
+ $(MCS) -r:custom-modifiers-lib.dll -out:custom-modifiers.exe $(srcdir)/custom-modifiers.2.cs
+custom-modifiers: custom-modifiers.exe
+ $(RUNTIME) custom-modifiers.exe
+
+EXTRA_DIST += bug-382986.cs bug-382986-lib.cs
+bug-382986-lib.dll: bug-382986-lib.cs
+ $(MCS) -target:library -out:$@ $(srcdir)/bug-382986-lib.cs
+bug-382986.exe: bug-382986.cs bug-382986-lib.dll
+ $(MCS) -out:$@ -r:bug-382986-lib.dll $(srcdir)/bug-382986.cs
+test-bug-382986: bug-382986.exe
+ $(RUNTIME) bug-382986.exe
+
EXTRA_DIST += coreclr-security.cs
if INSTALL_2_1
$(RUNTIME21) --security=core-clr-test coreclr-security.exe
endif
+EXTRA_DIST += generic-unboxing.2.il
+generic-unboxing.2.dll : generic-unboxing.2.il
+ $(ILASM) /dll /output:generic-unboxing.2.dll $(srcdir)/generic-unboxing.2.il
+
+EXTRA_DIST += generic-boxing.2.il
+generic-boxing.2.dll : generic-boxing.2.il generic-unboxing.2.dll
+ $(ILASM) /dll /output:generic-boxing.2.dll $(srcdir)/generic-boxing.2.il
+
+EXTRA_DIST += generic-unbox.2.cs
+generic-unbox.2.exe : generic-unbox.2.cs generic-unboxing.2.dll
+ $(MCS) -r:generic-unboxing.2.dll -out:$@ $(srcdir)/generic-unbox.2.cs
+
+EXTRA_DIST += generic-box.2.cs
+generic-box.2.exe : generic-box.2.cs generic-unboxing.2.dll generic-boxing.2.dll
+ $(MCS) -r:generic-unboxing.2.dll,generic-boxing.2.dll -out:$@ $(srcdir)/generic-box.2.cs
+
+test-generic-sharing : generics-sharing.2.exe shared-generic-methods.2.exe \
+ shared-generic-synchronized.2.exe generic-initobj.2.exe \
+ generics-sharing-other-exc.2.exe generic-box.2.exe \
+ generic-unbox.2.exe generic-delegate.2.exe generic-sizeof.2.exe \
+ generic-ldobj.2.exe generic-mkrefany.2.exe \
+ generic-refanyval.2.exe generic-ldtoken.2.exe \
+ generic-ldtoken-method.2.exe generic-ldtoken-field.2.exe \
+ generic-virtual.2.exe generic-tailcall.2.exe \
+ generic-interface-methods.2.exe generic-array-type.2.exe \
+ generic-method-patching.2.exe \
+ generic-null-call.2.exe
+ $(RUNTIME) -O=gshared,-inline generics-sharing.2.exe
+ $(RUNTIME) -O=gshared,-inline shared-generic-methods.2.exe
+ $(RUNTIME) -O=gshared,-inline shared-generic-synchronized.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-initobj.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-box.2.exe
+ $(RUNTIME) -O=gshared,-inline generics-sharing-other-exc.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-unbox.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-delegate.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-sizeof.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-ldobj.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-mkrefany.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-refanyval.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-ldtoken.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-ldtoken-method.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-ldtoken-field.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-virtual.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-tailcall.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-interface-methods.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-array-type.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-method-patching.2.exe
+ $(RUNTIME) -O=gshared,-inline generic-null-call.2.exe
+
EXTRA_DIST += async-exceptions.cs
async-exceptions.exe : async-exceptions.cs
$(MCS) -out:async-exceptions.exe $(srcdir)/async-exceptions.cs
noinst_LTLIBRARIES = libtest.la
-INCLUDES = $(GLIB_CFLAGS)
+INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
if PLATFORM_WIN32
# gcc-3.4.4 emits incorrect code when making indirect calls to stdcall functions using a tail call
libtest_la_LDFLAGS = -rpath `pwd`
endif
libtest_la_SOURCES = libtest.c
-libtest_la_LIBADD = $(GLIB_LIBS)
+libtest_la_LIBADD = $(glib_libs)
CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) $(STRESS_TESTS) *.dll *.stdout *.exe stest.dat
projects / mono.git / blobdiff