X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2FMake.tests;h=44e8d5e495b91fb5a6727b99f3ebc8124f9c8da9;hb=2c1c5ee2a8df5b9282b17b596bf48cbc33462478;hp=b60243f5c6bc7640fd2bc32bfa03c1833cbdaa7b;hpb=a705e9ae16e14e24d313916a0c5402e175f8cce5;p=pintos-anon

diff --git a/src/tests/Make.tests b/src/tests/Make.tests
index b60243f..44e8d5e 100644
--- a/src/tests/Make.tests
+++ b/src/tests/Make.tests
@@ -7,8 +7,11 @@ TESTS = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_TESTS))
 
 include ../../Makefile.userprog
 
-PINTOSFLAGS += -v $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
+TIMEOUT = 60
+PINTOSFLAGS += -v -T $(TIMEOUT)						\
+	$(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
 KERNELFLAGS += -q
+
 PINTOS = pintos $(PINTOSOPTS) $(PINTOSFLAGS) -- $(KERNELFLAGS)
 
 OUTPUTS = $(addsuffix .output,$(TESTS))
@@ -23,13 +26,13 @@ grade:: results
 
 check:: results
 	@cat $<
-	@COUNT="`egrep '^(pass|FAIL) ' $< | wc -l`";		\
-	FAILURES="`egrep '^FAIL ' $< | wc -l`";			\
-	if [ "$$FAILURES" = 0 ]; then				\
-		echo "All $$COUNT tests passed.";		\
-	else							\
-		echo "$$FAILURES of $$COUNT tests failed.";	\
-		exit 1;						\
+	@COUNT="`egrep '^(pass|FAIL) ' $< | wc -l | sed 's/[ 	]//g;'`"; \
+	FAILURES="`egrep '^FAIL ' $< | wc -l | sed 's/[ 	]//g;'`"; \
+	if [ $$FAILURES = 0 ]; then					  \
+		echo "All $$COUNT tests passed.";			  \
+	else								  \
+		echo "$$FAILURES of $$COUNT tests failed.";		  \
+		exit 1;							  \
 	fi
 
 results: $(RESULTS)