X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Ftests%2FMake.tests;h=358e69724b156b15dc98c76301367015ee3b6a59;hp=76d63f676cd838f76ffc20a75508ad377428ddca;hb=a03618133f7df0954802a470a4bee7674f7aed45;hpb=bb940d21474958a1d8ee2abffdcb6bac27918398

diff --git a/src/tests/Make.tests b/src/tests/Make.tests
index 76d63f6..358e697 100644
--- a/src/tests/Make.tests
+++ b/src/tests/Make.tests
@@ -55,13 +55,13 @@ TESTCMD = pintos -v -k -T $(TIMEOUT)
 TESTCMD += $(SIMULATOR)
 TESTCMD += $(PINTOSOPTS)
 ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)
-TESTCMD += --fs-disk=$(FSDISK)
+TESTCMD += $(FILESYSSOURCE)
 TESTCMD += $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
 endif
 ifeq ($(filter vm, $(KERNEL_SUBDIRS)), vm)
-TESTCMD += --swap-disk=4
+TESTCMD += --swap-size=4
 endif
-TESTCMD += -- -q 
+TESTCMD += -- -q
 TESTCMD += $(KERNELFLAGS)
 ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)
 TESTCMD += -f
@@ -69,7 +69,7 @@ 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
+%.output: kernel.bin loader.bin
 	$(TESTCMD)
 
 %.result: %.ck %.output