X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2FMake.tests;h=6595b468eeb7c04d90def8f781396b89a650f8ee;hb=837e5b7fb902bd749106309ef76a5276c73ca34c;hp=b98a75d33e65d460a565373d7682865551c7b448;hpb=b51bfd75c7f55f008d67ec13d895694fbfa22430;p=pintos-anon diff --git a/src/tests/Make.tests b/src/tests/Make.tests index b98a75d..6595b46 100644 --- a/src/tests/Make.tests +++ b/src/tests/Make.tests @@ -47,7 +47,7 @@ $(foreach prog,$(PROGS),$(eval $(prog).output: $(prog))) $(foreach test,$(TESTS),$(eval $(test).output: $($(test)_PUTFILES))) $(foreach test,$(TESTS),$(eval $(test).output: TEST = $(test))) -TESTCMD = pintos -v -T $(TIMEOUT) +TESTCMD = pintos -v -k -T $(TIMEOUT) TESTCMD += $(SIMULATOR) TESTCMD += $(PINTOSOPTS) ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog) @@ -63,6 +63,7 @@ ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog) TESTCMD += -f endif TESTCMD += $(if $($(TEST)_ARGS),run '$(*F) $($(TEST)_ARGS)',run $(*F)) +TESTCMD += < /dev/null TESTCMD += 2> $(TEST).errors $(if $(VERBOSE),|tee,>) $(TEST).output %.output: os.dsk $(TESTCMD)