Implement a proper block layer with partition support.

[pintos-anon] / src / tests / userprog / Make.tests

diff --git a/src/tests/userprog/Make.tests b/src/tests/userprog/Make.tests
index f8ad9c977d852cdfd548f8a9075ed7cc56d981ad..caadd90edbef093b184e682841f182b335eef99e 100644 (file)
--- a/src/tests/userprog/Make.tests
+++ b/src/tests/userprog/Make.tests
@@ -1,9 +1,7 @@
 # -*- makefile -*-
 
-PINTOSFLAGS += --fs-disk=2
-KERNELFLAGS += -f
-
-tests/%.output: PUTFILES = $(filter-out os.dsk, $^)
+tests/%.output: FILESYSSOURCE = --filesys-size=2
+tests/%.output: PUTFILES = $(filter-out kernel.bin loader.bin, $^)
 
 tests/userprog_TESTS = $(addprefix tests/userprog/,args-none           \
 args-single args-multiple args-many args-dbl-space sc-bad-sp           \
@@ -16,7 +14,8 @@ read-zero read-stdout read-bad-fd write-normal write-bad-ptr          \
 write-boundary write-zero write-stdin write-bad-fd exec-once exec-arg  \
 exec-multiple exec-missing exec-bad-ptr wait-simple wait-twice         \
 wait-killed wait-bad-pid multi-recurse multi-child-fd rox-simple       \
-rox-child rox-multichild)
+rox-child rox-multichild bad-read bad-write bad-read2 bad-write2        \
+bad-jump bad-jump2)
 
 tests/userprog_PROGS = $(tests/userprog_TESTS) $(addprefix \
 tests/userprog/,child-simple child-args child-bad child-close child-rox)
@@ -28,6 +27,12 @@ tests/userprog/args-many_SRC = tests/userprog/args.c
 tests/userprog/args-dbl-space_SRC = tests/userprog/args.c
 tests/userprog/sc-bad-sp_SRC = tests/userprog/sc-bad-sp.c tests/main.c
 tests/userprog/sc-bad-arg_SRC = tests/userprog/sc-bad-arg.c tests/main.c
+tests/userprog/bad-read_SRC = tests/userprog/bad-read.c tests/main.c
+tests/userprog/bad-write_SRC = tests/userprog/bad-write.c tests/main.c
+tests/userprog/bad-jump_SRC = tests/userprog/bad-jump.c tests/main.c
+tests/userprog/bad-read2_SRC = tests/userprog/bad-read2.c tests/main.c
+tests/userprog/bad-write2_SRC = tests/userprog/bad-write2.c tests/main.c
+tests/userprog/bad-jump2_SRC = tests/userprog/bad-jump2.c tests/main.c
 tests/userprog/sc-boundary_SRC = tests/userprog/sc-boundary.c  \
 tests/userprog/boundary.c tests/main.c
 tests/userprog/sc-boundary-2_SRC = tests/userprog/sc-boundary-2.c      \