Delete .tar, .get-output, and .get-errors files on "clean" target.

[pintos-anon] / src / tests / filesys / extended / Make.tests

diff --git a/src/tests/filesys/extended/Make.tests b/src/tests/filesys/extended/Make.tests
index 1aeb8dd1acb68ba0071d6580b1b38f3d88662fd1..72539a5e8ddfaad2f841486de0108afce8e1e84c 100644 (file)
--- a/src/tests/filesys/extended/Make.tests
+++ b/src/tests/filesys/extended/Make.tests
@@ -16,8 +16,9 @@ $(foreach prog,$(tests/filesys/extended_TESTS),               \
        $(eval $(prog)_SRC += tests/main.c))
 $(foreach prog,$(tests/filesys/extended_TESTS),                \
        $(eval $(prog)_PUTFILES += tests/filesys/extended/tar))
-$(foreach test,$(tests/filesys/extended_TESTS),        \
-       $(eval $(test).output: FSDISK = tmp.dsk))
+# The version of GNU make 3.80 on vine barfs if this is split at
+# the last comma.
+$(foreach test,$(tests/filesys/extended_TESTS),$(eval $(test).output: FSDISK = tmp.dsk))
 
 tests/filesys/extended/dir-mk-tree_SRC += tests/filesys/extended/mk-tree.c
 tests/filesys/extended/dir-rm-tree_SRC += tests/filesys/extended/mk-tree.c
@@ -27,7 +28,7 @@ tests/filesys/extended/syn-rw_PUTFILES += tests/filesys/extended/child-syn-rw
 
 GETTIMEOUT = 60
 
-GETCMD = pintos -v -T $(GETTIMEOUT)
+GETCMD = pintos -v -k -T $(GETTIMEOUT)
 GETCMD += $(PINTOSOPTS)
 GETCMD += $(SIMULATOR)
 GETCMD += --fs-disk=$(FSDISK)
@@ -38,8 +39,8 @@ endif
 GETCMD += -- -q
 GETCMD += $(KERNELFLAGS)
 GETCMD += run 'tar fs.tar /'
-GETCMD += 2>> $(TEST).get-errors
-GETCMD += $(if $(VERBOSE),|tee -a,>>) $(TEST).get-output
+GETCMD += < /dev/null
+GETCMD += 2> $(TEST).get-errors $(if $(VERBOSE),|tee,>) $(TEST).get-output
 
 tests/filesys/extended/%.output: os.dsk
        rm -f tmp.dsk
@@ -47,3 +48,10 @@ tests/filesys/extended/%.output: os.dsk
        $(TESTCMD)
        $(GETCMD)
        rm -f tmp.dsk
+
+TARS = $(addsuffix .tar,$(tests/filesys/extended_TESTS))
+GET_OUTPUTS = $(addsuffix .get-output,$(tests/filesys/extended_TESTS))
+GET_ERRORS = $(addsuffix .get-errors,$(tests/filesys/extended_TESTS))
+
+clean::
+       rm -f $(TARS) $(GET_OUTPUTS) $(GET_ERRORS)