X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2FMakefile.am;h=25e723d94bf9ada9ca51d8d2cff97d2c590a47c3;hb=3c5660e0c63458b7f660cc794192f3f5d6df9d6e;hp=39a93fdd1101cb9be013578fe29e514f4e28b10d;hpb=c842bdee36a48875a79b0bd64ed72e11f6f7ac80;p=mono.git

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 39a93fdd110..25e723d94bf 100644
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1,15 +1,16 @@
 
 TEST_PROG=../interpreter/mint
-JITTEST_PROG=../jit/mono
-RUNTIME_ARGS=--config tests-config
-
-CSC=csc /unsafe
+JITTEST_PROG=../mini/mono
+RUNTIME_ARGS=--config tests-config --optimize=all
+#CSC=csc /unsafe
+CSC=mcs --unsafe -nowarn:0162
 
 BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
 
 TEST_CS_SRC=			\
 	array-init.cs		\
 	arraylist.cs		\
+	checked.cs		\
 	char-isnumber.cs	\
 	create-instance.cs	\
 	field-layout.cs		\
@@ -36,6 +37,8 @@ TEST_CS_SRC=			\
 	exception12.cs		\
 	exception13.cs		\
 	exception14.cs		\
+	exception15.cs		\
+	exception16.cs		\
 	struct.cs		\
 	valuetype-gettype.cs	\
 	static-constructor.cs	\
@@ -43,17 +46,19 @@ TEST_CS_SRC=			\
 	pinvoke1.cs		\
 	pinvoke2.cs		\
 	pinvoke3.cs		\
-	pinvoke4.cs		\
-	pinvoke5.cs		\
-	pinvoke6.cs		\
-	pinvoke7.cs		\
-	pinvoke8.cs		\
 	pinvoke9.cs		\
 	pinvoke10.cs		\
 	pinvoke11.cs		\
-	pinvoke12.cs		\
+	pinvoke13.cs		\
+	pinvoke14.cs		\
+	pinvoke15.cs		\
+	pinvoke16.cs		\
+	pinvoke17.cs		\
+	pinvoke18.cs		\
 	invoke.cs		\
 	invoke2.cs		\
+	runtime-invoke.cs		\
+	invoke-string-ctors.cs		\
 	reinit.cs		\
 	box.cs			\
 	array.cs		\
@@ -105,12 +110,13 @@ TEST_CS_SRC=			\
 	jit-float.cs		\
 	pop.cs			\
 	time.cs			\
-	appdomain.cs		\
+	appdomain.cs        \
 	appdomain1.cs		\
 	appdomain2.cs		\
+	appdomain3.cs		\
 	appdomain-client.cs	\
+	appdomain-unload.cs \
 	pointer.cs		\
-	vararg.cs		\
 	rounding.cs		\
 	hashcode.cs		\
 	delegate1.cs		\
@@ -123,6 +129,8 @@ TEST_CS_SRC=			\
 	remoting1.cs		\
 	remoting2.cs		\
 	remoting3.cs		\
+	remoting4.cs		\
+	remoting5.cs		\
 	nonvirt.cs		\
 	largeexp.cs		\
 	largeexp2.cs		\
@@ -136,46 +144,85 @@ TEST_CS_SRC=			\
 	marshal1.cs		\
 	marshal2.cs		\
 	marshal3.cs		\
-	marshal4.cs		\
+	marshal5.cs		\
+	marshal6.cs		\
+	marshal7.cs		\
+	marshal8.cs		\
+	marshal9.cs		\
+	marshal10.cs		\
+	test-byval-in-struct.cs	\
 	thread.cs		\
 	thread5.cs		\
 	thread6.cs		\
+	thread-static.cs	\
+	context-static.cs	\
 	float-pop.cs		\
 	interfacecast.cs	\
-	array3.cs
+	array3.cs		\
+	classinit.cs		\
+	classinit2.cs		\
+	synchronized.cs		\
+	async_read.cs		\
+	threadpool.cs		\
+	threadpool1.cs		\
+	base-definition.cs	\
+	bug-27420.cs		\
+	bug-47295.cs		\
+	bug-46781.cs		\
+	bug-48015.cs		\
+	bug-42136.cs
+
+if X86
+PLATFORM_DISABLED_TESTS=
+endif
+
+DISABLED_TESTS=			\
+	$(PLATFORM_DISABLED_TESTS)
+
+# These only compile with MS CSC
+TEST_CSC_SRC=			\
+	vararg.cs
 
 TEST_IL_SRC=			\
 	cpblkTest.il		\
-	jmpTest.il		\
+	jmpTest.il			\
 	calliTest.il		\
 	ckfiniteTest.il		\
 	locallocTest.il		\
-	initblkTest.il
+	initblkTest.il		\
+	qt-instance.il		\
+	vararg.il			\
+	bug-29859.il		\
+	even-odd.il
 
 
 TESTSI_CS=$(TEST_CS_SRC:.cs=.exe)
 TESTSI_IL=$(TEST_IL_SRC:.il=.exe)
 TESTBS=$(BENCHSRC:.cs=.exe)
 
-EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC)
+EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC) $(BENCHSRC)
 
 %.exe: %.il
-	ilasm $< /OUTPUT=$@
+	ilasm -out:$@ $<
 
-%.exe: %.cs
-	$(CSC) $<
+%.exe: %.cs TestDriver.dll
+	$(CSC) -r:TestDriver.dll -out:$@ $<
 
-test:	test_cs test_il
+test:	testjit
+
+TestDriver.dll:
+	$(CSC) -target:library -o $@ $(srcdir)/../mini/TestDriver.cs
 
 test_cs: $(TEST_PROG) $(TESTSI_CS) libtest.la
 	@failed=0; \
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
 	for i in $(TESTSI_CS); do	\
-		if ./test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
+			if [ $$? = 2 ]; then break; fi; \
 			failed=`expr $${failed} + 1`; \
 		fi \
 	done; \
@@ -186,10 +233,11 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
 	for i in $(TESTSI_IL); do	\
-		if ./test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+		if $(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
+			if [ $$? = 2 ]; then break; fi; \
 			failed=`expr $${failed} + 1`; \
 		fi \
 	done; \
@@ -197,22 +245,65 @@ test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
 
 testb: $(TEST_PROG) $(TESTBS)
 	for i in $(TESTBS); do	\
-		./test-driver $(TEST_PROG) $$ii $(RUNTIME_ARGS);	\
+		$(srcdir)/test-driver $(TEST_PROG) $$i "$(DISABLED_TESTS)" $(RUNTIME_ARGS);	\
 	done
 
-testjit: $(JITTEST_PROG) $(TESTSI_CS) $(TESTSI_IL) $(TESTBS)
+testjit: $(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) $(TESTSI_IL); do	\
+		rm -f $${i}.so; \
+		if $(srcdir)/test-driver $(JITTEST_PROG) $$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) failed."; \
+	if [ $${failed} != 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi; 
+
+testaot: $(TESTSI_CS) $(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	\
+		rm -f $${i}.so; \
+		$(JITTEST_PROG) --aot $${i} > /dev/null; \
+		if $(srcdir)/test-driver $(JITTEST_PROG) $$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) failed."; \
+	if [ $$failed != 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi; 
+
+testinterp: $(TESTSI_CS) $(TESTSI_IL) libtest.la
 	@failed=0; \
 	passed=0; \
+	failed_tests="";\
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
-	for i in $(TESTSI_CS) $(TESTSI_IL) $(TESTBS); do	\
-		if ./test-driver $(JITTEST_PROG) $$i $(RUNTIME_ARGS); \
+	for i in $(TESTSI_CS) $(TESTSI_IL); do \
+		if $(srcdir)/test-driver $(TEST_PROG) $$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) failed."
+	echo "$${passed} test(s) passed. $${failed} test(s) failed."; \
+	if [ $$failed != 0 ]; then echo -e "\nFailed tests:\n"; for i in $${failed_tests}; do echo $${i}; done; fi ;
 
 testjitspeed: $(JITTEST_PROG) $(TESTBS)
 	for i in $(TESTBS); do	\
@@ -225,5 +316,11 @@ check:
 
 noinst_LTLIBRARIES = libtest.la
 
+INCLUDES = $(GLIB_CFLAGS)
+
 libtest_la_LDFLAGS = -rpath `pwd`
 libtest_la_SOURCES = libtest.c
+libtest_la_LIBADD = $(GLIB_LIBS)
+
+CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) TestDriver.dll *.stdout
+