X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Ffilesys%2Fextended%2FMake.tests;h=72539a5e8ddfaad2f841486de0108afce8e1e84c;hb=b13a0f40a52b47d3ceea92887adc9543c1d94aed;hp=2ba4d76e5d1e2a5005512e45bc67518f2283bc93;hpb=f14d80c05e67af1545779f038d9f47dec2188fc3;p=pintos-anon diff --git a/src/tests/filesys/extended/Make.tests b/src/tests/filesys/extended/Make.tests index 2ba4d76..72539a5 100644 --- 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 @@ -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)