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

diff --git a/src/tests/Make.tests b/src/tests/Make.tests
index b60243f..b98a75d 100644
--- a/src/tests/Make.tests
+++ b/src/tests/Make.tests
@@ -5,16 +5,16 @@ include $(patsubst %,$(SRCDIR)/%/Make.tests,$(TEST_SUBDIRS))
 PROGS = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_PROGS))
 TESTS = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_TESTS))
 
-include ../../Makefile.userprog
-
-PINTOSFLAGS += -v $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
-KERNELFLAGS += -q
-PINTOS = pintos $(PINTOSOPTS) $(PINTOSFLAGS) -- $(KERNELFLAGS)
-
 OUTPUTS = $(addsuffix .output,$(TESTS))
 ERRORS = $(addsuffix .errors,$(TESTS))
 RESULTS = $(addsuffix .result,$(TESTS))
 
+ifdef PROGS
+include ../../Makefile.userprog
+endif
+
+TIMEOUT = 60
+
 clean::
 	rm -f $(OUTPUTS) $(ERRORS) $(RESULTS) 
 
@@ -23,13 +23,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)
@@ -45,11 +45,27 @@ outputs:: $(OUTPUTS)
 
 $(foreach prog,$(PROGS),$(eval $(prog).output: $(prog)))
 $(foreach test,$(TESTS),$(eval $(test).output: $($(test)_PUTFILES)))
-tests/%.output: RUNCMD = $(if $($*_ARGS),run '$(*F) $($*_ARGS)',run $(*F))
-tests/%.output: RUNREDIR = 2>$*.errors $(if $(VERBOSE),|tee,>) $*.output
-tests/%.output: RUNTEST = $(PINTOS) $(RUNCMD) $(RUNREDIR)
+$(foreach test,$(TESTS),$(eval $(test).output: TEST = $(test)))
+
+TESTCMD = pintos -v -T $(TIMEOUT)
+TESTCMD += $(SIMULATOR)
+TESTCMD += $(PINTOSOPTS)
+ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)
+TESTCMD += --fs-disk=$(FSDISK)
+TESTCMD += $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
+endif
+ifeq ($(filter vm, $(KERNEL_SUBDIRS)), vm)
+TESTCMD += --swap-disk=4
+endif
+TESTCMD += -- -q 
+TESTCMD += $(KERNELFLAGS)
+ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)
+TESTCMD += -f
+endif
+TESTCMD += $(if $($(TEST)_ARGS),run '$(*F) $($(TEST)_ARGS)',run $(*F))
+TESTCMD += 2> $(TEST).errors $(if $(VERBOSE),|tee,>) $(TEST).output
 %.output: os.dsk
-	$(RUNTEST)
+	$(TESTCMD)
 
 %.result: %.ck %.output
 	perl -I$(SRCDIR) $< $* $@