From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 9 Jan 2005 00:45:47 +0000 (+0000)
Subject: Add a `null' test for testing src/userprog before system calls have
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af584a2aaa0ed870dc76df97097dbee32aeac488;p=pintos-anon

Add a `null' test for testing src/userprog before system calls have
been implemented.
---

diff --git a/grading/userprog/Make.base b/grading/userprog/Make.base
index 77c580d..d78787c 100644
--- a/grading/userprog/Make.base
+++ b/grading/userprog/Make.base
@@ -6,7 +6,12 @@ child_arg_SRC = child-arg.c
 child_bad_SRC = child-bad.c
 child_close_SRC = child-close.c
 
-DISKS = $(patsubst %,%.dsk,$(TESTS))
+null.o: null.S
+null: null.o
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+null.dsk: null	
+
+DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
 
 disks: $(DISKS)
 
diff --git a/grading/userprog/Makefile b/grading/userprog/Makefile
index 1eb67b3..2b96694 100644
--- a/grading/userprog/Makefile
+++ b/grading/userprog/Makefile
@@ -76,10 +76,15 @@ child_arg_SRC = child-arg.c
 child_bad_SRC = child-bad.c
 child_close_SRC = child-close.c
 
-DISKS = $(patsubst %,%.dsk,$(TESTS))
+DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
 
 disks: $(DISKS)
 
+null.o: null.S
+null: null.o
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+null.dsk: null	
+
 exec-once.dsk exec-multiple.dsk join-simple.dsk join-twice.dsk: child-simple
 exec-arg.dsk: child-arg
 join-killed.dsk: child-bad
diff --git a/grading/userprog/null.S b/grading/userprog/null.S
new file mode 100644
index 0000000..e4f7e3a
--- /dev/null
+++ b/grading/userprog/null.S
@@ -0,0 +1,3 @@
+	.globl _start
+_start:		
+	int $0x30
diff --git a/grading/userprog/null.exp b/grading/userprog/null.exp
new file mode 100644
index 0000000..001f798
--- /dev/null
+++ b/grading/userprog/null.exp
@@ -0,0 +1 @@
+system call!