X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2FMakefile.am;h=aa7a78ff60ddd0197283dc169df229f0175aa21e;hb=10f375d325d1a21ce58b387864bbb3bee0f0b20a;hp=572aab597dbdc0acb3199a2d7124aebd6f8145e1;hpb=1f2d254cd61d89fcf0c8c52f8dc0bcf5383df159;p=mono.git

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 572aab597db..aa7a78ff60d 100644
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1,16 +1,19 @@
 
 TEST_PROG=../interpreter/mint
 JITTEST_PROG=../jit/mono
+RUNTIME_ARGS=--config tests-config
 
 CSC=csc /unsafe
 
 BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
 
-TESTSRC=			\
+TEST_CS_SRC=			\
 	array-init.cs		\
 	arraylist.cs		\
 	char-isnumber.cs	\
+	create-instance.cs	\
 	field-layout.cs		\
+	pack-layout.cs		\
 	hash-table.cs		\
 	test-ops.cs		\
 	obj.cs			\
@@ -28,11 +31,27 @@ TESTSRC=			\
 	exception6.cs		\
 	exception7.cs		\
 	exception8.cs		\
+	exception10.cs		\
+	exception11.cs		\
+	exception12.cs		\
+	exception13.cs		\
+	exception14.cs		\
 	struct.cs		\
 	valuetype-gettype.cs	\
 	static-constructor.cs	\
 	pinvoke.cs		\
 	pinvoke1.cs		\
+	pinvoke2.cs		\
+	pinvoke3.cs		\
+	pinvoke4.cs		\
+	pinvoke5.cs		\
+	pinvoke6.cs		\
+	pinvoke7.cs		\
+	pinvoke8.cs		\
+	pinvoke9.cs		\
+	invoke.cs		\
+	invoke2.cs		\
+	reinit.cs		\
 	box.cs			\
 	array.cs		\
 	enum.cs			\
@@ -42,6 +61,8 @@ TESTSRC=			\
 	assignable-tests.cs	\
 	array-cast.cs		\
 	cattr-compile.cs	\
+	cattr-field.cs		\
+	cattr-object.cs		\
 	custom-attr.cs		\
 	double-cast.cs		\
 	newobj-valuetype.cs	\
@@ -82,6 +103,8 @@ TESTSRC=			\
 	pop.cs			\
 	time.cs			\
 	appdomain.cs		\
+	appdomain1.cs		\
+	appdomain2.cs		\
 	appdomain-client.cs	\
 	pointer.cs		\
 	vararg.cs		\
@@ -92,6 +115,8 @@ TESTSRC=			\
 	delegate3.cs		\
 	delegate4.cs		\
 	delegate5.cs		\
+	delegate6.cs		\
+	delegate7.cs		\
 	remoting1.cs		\
 	remoting2.cs		\
 	remoting3.cs		\
@@ -100,42 +125,82 @@ TESTSRC=			\
 	largeexp2.cs		\
 	marshalbyref1.cs	\
 	static-ctor.cs		\
-	inctest.cs
+	inctest.cs		\
+	bound.cs		\
+	array-invoke.cs		\
+	decimal.cs		\
+	decimal-array.cs	\
+	marshal1.cs		\
+	marshal2.cs		\
+	marshal3.cs		\
+	marshal4.cs		\
+	thread.cs		\
+	thread5.cs		\
+	thread6.cs		\
+	float-pop.cs
 
+TEST_IL_SRC=			\
+	cpblkTest.il		\
+	jmpTest.il		\
+	calliTest.il		\
+	ckfiniteTest.il		\
+	locallocTest.il		\
+	initblkTest.il
 
-TESTSI=$(TESTSRC:.cs=.exe)
+
+TESTSI_CS=$(TEST_CS_SRC:.cs=.exe)
+TESTSI_IL=$(TEST_IL_SRC:.il=.exe)
 TESTBS=$(BENCHSRC:.cs=.exe)
 
-EXTRA_DIST=test-driver $(TESTSRC)
+EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC)
+
+%.exe: %.il
+	ilasm $< /OUTPUT=$@
 
 %.exe: %.cs
 	$(CSC) $<
 
-test: $(TEST_PROG) $(TESTSI) libtest.la
+test:	test_cs test_il
+
+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); do	\
-		if ./test-driver $(TEST_PROG) $$i; \
+	for i in $(TESTSI_CS); do	\
+		if ./test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
 			failed=`expr $${failed} + 1`; \
 		fi \
 	done; \
-	echo "$${passed} test(s) passed. $${failed} test(s) failed."
+	echo; echo ".cs: $${passed} test(s) passed. $${failed} test(s) failed."; echo
+
+test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
+	@failed=0; \
+	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); \
+		then \
+			passed=`expr $${passed} + 1`; \
+		else \
+			failed=`expr $${failed} + 1`; \
+		fi \
+	done; \
+	echo; echo ".il: $${passed} test(s) passed. $${failed} test(s) failed."; echo
 
 testb: $(TEST_PROG) $(TESTBS)
 	for i in $(TESTBS); do	\
-		./test-driver $(TEST_PROG) $$i;	\
+		./test-driver $(TEST_PROG) $$ii $(RUNTIME_ARGS);	\
 	done
 
-testjit: $(JITTEST_PROG) $(TESTSI) $(TESTBS)
+testjit: $(JITTEST_PROG) $(TESTSI_CS) $(TESTSI_IL) $(TESTBS)
 	@failed=0; \
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
-	for i in $(TESTSI) $(TESTBS); do	\
-		if ./test-driver $(JITTEST_PROG) $$i; \
+	for i in $(TESTSI_CS) $(TESTSI_IL) $(TESTBS); do	\
+		if ./test-driver $(JITTEST_PROG) $$i $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \