projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch set 6 by Ben, derived from Anthony's megapatch, and minor
[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 75a872baa62a5fdebb143b5d32b0e8d3feea54a2..e03b98dc4fbfc69f1808ba2e8f13a902e75e1ea7 100644
(file)
--- a/
src/tests/filesys/extended/Make.tests
+++ b/
src/tests/filesys/extended/Make.tests
@@
-20,7
+20,7
@@
$(foreach prog,$(tests/filesys/extended_TESTS), \
$(eval $(prog)_PUTFILES += tests/filesys/extended/tar))
# The version of GNU make 3.80 on vine barfs if this is split at
# the last comma.
$(eval $(prog)_PUTFILES += tests/filesys/extended/tar))
# 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: F
SDISK =
tmp.dsk))
+$(foreach test,$(tests/filesys/extended_TESTS),$(eval $(test).output: F
ILESYSSOURCE = --disk=
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
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
@@
-34,10
+34,10
@@
GETTIMEOUT = 60
GETCMD = pintos -v -k -T $(GETTIMEOUT)
GETCMD += $(PINTOSOPTS)
GETCMD += $(SIMULATOR)
GETCMD = pintos -v -k -T $(GETTIMEOUT)
GETCMD += $(PINTOSOPTS)
GETCMD += $(SIMULATOR)
-GETCMD +=
--fs-disk=$(FSDISK
)
+GETCMD +=
$(FILESYSSOURCE
)
GETCMD += -g fs.tar -a $(TEST).tar
ifeq ($(filter vm, $(KERNEL_SUBDIRS)), vm)
GETCMD += -g fs.tar -a $(TEST).tar
ifeq ($(filter vm, $(KERNEL_SUBDIRS)), vm)
-GETCMD += --swap-
disk
=4
+GETCMD += --swap-
size
=4
endif
GETCMD += -- -q
GETCMD += $(KERNELFLAGS)
endif
GETCMD += -- -q
GETCMD += $(KERNELFLAGS)
@@
-45,9
+45,9
@@
GETCMD += run 'tar fs.tar /'
GETCMD += < /dev/null
GETCMD += 2> $(TEST)-persistence.errors $(if $(VERBOSE),|tee,>) $(TEST)-persistence.output
GETCMD += < /dev/null
GETCMD += 2> $(TEST)-persistence.errors $(if $(VERBOSE),|tee,>) $(TEST)-persistence.output
-tests/filesys/extended/%.output:
os.dsk
+tests/filesys/extended/%.output:
kernel.bin
rm -f tmp.dsk
rm -f tmp.dsk
- pintos-mkdisk tmp.dsk 2
+ pintos-mkdisk tmp.dsk
--filesys-size=
2
$(TESTCMD)
$(GETCMD)
rm -f tmp.dsk
$(TESTCMD)
$(GETCMD)
rm -f tmp.dsk