X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftests%2Fmakefile;h=cf283798c5928d34bf792fd8151a65f3f3fcc5ea;hb=65b228757e444ae8f4f25fca0dfb7f82aafc13b0;hp=b991b9e13508a8c3f1b29700e5f1f1cfd9b7e036;hpb=045ff9d50cb9fccb5625da4c21912ce8bd3847f3;p=mono.git

diff --git a/mcs/tests/makefile b/mcs/tests/makefile
index b991b9e1350..cf283798c59 100755
--- a/mcs/tests/makefile
+++ b/mcs/tests/makefile
@@ -1,67 +1,119 @@
+#
+# You can change "RUNTIME" to control what runtime to use
+# ie, make vs make RUNTIME=mono
+# 
 CSC=csc.exe
 
 MCS=../mcs/mcs.exe
+MCS2=mono ../mcs/mcs-mono2.exe
 VERIFY=../tools/verifier.exe
 
 TEST_SOURCES = \
-	test-1  test-2  test-3  test-4  test-5  test-6  test-7  test-8  test-9  test-10 \
-	test-11 test-12 test-13 test-14 test-15 test-16 test-17 test-18 test-19 test-20 \
-	test-21 test-22 test-23 test-24 test-25 test-26 test-27 test-28 	test-30	\
-	test-31 test-32 test-33 test-34 test-35 test-36	test-37 	test-39 test-40 \
-	test-41 test-42 test-43 test-44 test-45 test-46 test-47 test-48 test-49 test-50 \
-	test-51 test-52	test-53 test-54 test-55 test-56 test-57		test-59 	\
-	test-61	test-62 test-63	test-64 test-65 test-66 test-67 test-68 test-69 test-70	\
-	test-71 test-72 test-73 test-74 test-75		test-77 test-78 test-79 test-80 \
-	test-81
+	test-1   test-2   test-3   test-4   test-5   test-6   test-7   test-8   test-9   test-10 \
+	test-11  test-12  test-13  test-14  test-15  test-16  test-17  test-18  test-19  test-20 \
+	test-21  test-22  test-23  test-24  test-25  test-26  test-27  test-28           test-30 \
+	test-31  test-32  test-33  test-34  test-35  test-36  test-37  test-38  test-39  test-40 \
+	test-41  test-42  test-43  test-44  test-45  test-46  test-47  test-48  test-49  \
+	test-51  test-52  test-53  test-54  test-55  test-56  test-57  test-59           test-60 \
+	test-61	 test-62  test-63  test-64  test-65  test-66  test-68  test-69           test-70 \
+	test-71  test-72  test-73  test-74  test-75  test-76  test-77  test-78  test-79  test-80 \
+	test-81  test-82  test-83  test-84  test-85  test-86  test-87  test-88  test-89  test-90 \
+	test-91  test-92  test-93  test-94  test-95  test-96  test-97  test-98  test-99  test-100\
+	test-101 test-102 test-103 test-104 test-105 test-106 test-107 test-108 test-109 test-110\
+	test-111 test-112 test-113 test-114 test-115 test-116 test-117 test-118 test-119 test-120\
+	test-121 test-122 test-123          test-125 test-126 test-127 test-128 test-129 test-130 \
+	test-131 test-132 test-133 test-134 test-135                            test-138
 
 UNSAFE_SOURCES = \
-	unsafe-1 unsafe-2
+	unsafe-1 unsafe-2 unsafe-3
 
+WINDOWS_SOURCES = \
+	test-50 test-67
+
+# A test is a 'no pass' if it fails on either windows or linux
+# Test 120 does not pass because the MS.NET runtime is buggy.
 TEST_NOPASS = \
-	test-29 test-38 test-76
+	test-29 test-38 test-120
+
+all: test-compiler test-unsafe test-windows
 
-all: test-compiler test-unsafe
 
+# Compile with mono, run with MS jit
 test-compiler:
-	-rm *.exe
+	@rm -f *.exe; \
 	for i in $(TEST_SOURCES); do \
+		echo -n "Running $$i ... "; \
 		if $(MCS) $$i.cs > /dev/null; then \
-			if ./$$i.exe; then \
+			if $(RUNTIME) ./$$i.exe > /dev/null; then \
 				echo $$i: ok; \
 			else \
-				echo test $$i failed; exit; \
+				echo FAILED; exit 1; \
 			fi; \
 		else \
-			echo compiler failed on $$i;   exit; \
+			echo FAILED TO COMPILE; exit 1; \
 		fi \
 	done
 
+# Compile with mono, run with MS jit
 test-unsafe:
-	for i in $(UNSAFE_SOURCES); do \
+	@for i in $(UNSAFE_SOURCES); do \
+		echo -n "Running (unsafe) $$i ... "; \
 		if $(MCS) --unsafe $$i.cs > /dev/null; then \
-			if ./$$i.exe; then \
-				echo $$i: ok; \
+			if $(RUNTIME) ./$$i.exe > /dev/null; then \
+				echo OK; \
 			else \
-				echo test $$i failed; exit; \
+				echo FAILED; exit 1; \
 			fi; \
 		else \
-			echo compiler failed on $$i;   exit; \
+			echo FAILED WHILE COMPILING; exit 1; \
 		fi \
 	done
 
+# Compiled (previously) with mono, run with mono jit
 test-jit:
-	for i in $(TEST_SOURCES:.cs=.exe); do \
-		if mono ./$$i.exe; then \
-			echo $$i: ok; \
+	@for i in $(TEST_SOURCES:.cs=.exe); do \
+		echo -n "Running jit $$i ... "; \
+		if mono ./$$i.exe > /dev/null; then \
+			echo OK; \
 		else \
-			echo test $$i failed; exit; \
+			echo FAILED; exit 1; \
 		fi \
 	done
 
+# Compiled with mono, run with MS jit
+test-windows:
+	@echo Running windows-only tests - these will fail on linux; \
+	for i in $(WINDOWS_SOURCES); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS) $$i.cs > /dev/null; then \
+			if ./$$i.exe > /dev/null; then \
+				echo OK; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
 
+# Compile with mono, run with mono jit
+test-compiler-mono:
+	@rm -f *.exe; \
+	for i in $(TEST_SOURCES); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS2) $$i.cs > /dev/null; then \
+			if mono ./$$i.exe > /dev/null; then \
+				echo OK; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
 
 verify:
-	for i in $(TEST_SOURCES); do \
+	@for i in $(TEST_SOURCES); do \
 		if $(MCS) -o mcs-gen-code.exe $$i.cs > /dev/null; then \
 	        	if $(CSC) /out:csc-gen-code.exe $$i.cs > /dev/null; then \
 				if $(VERIFY) mcs-gen-code.exe csc-gen-code.exe > /dev/null; then \
@@ -71,7 +123,8 @@ verify:
 				fi; \
 			fi \
 		fi \
-	done
+	done; \
+	echo Verification passed
 
 
 casts.cs: gen-cast-test.cs