X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftests%2Fuserprog%2FMakefile;h=291cf75bbffb83a55a102f9689276c26c871ab23;hb=9890d47f4dba4ab2784a4ed5d424cddf697cfe18;hp=eac2f2df156dc9e0c139bde3367324c251a09e13;hpb=4fbba40cd34402c014c66576490455c58856b51a;p=pintos-anon

diff --git a/src/tests/userprog/Makefile b/src/tests/userprog/Makefile
index eac2f2d..291cf75 100644
--- a/src/tests/userprog/Makefile
+++ b/src/tests/userprog/Makefile
@@ -1,34 +1,8 @@
-include ../../Make.config
-
-SHELL = /bin/sh
-
-LDFLAGS = -nostdlib -static
-LDLIBS = $(shell $(CC) -print-libgcc-file-name)
-
-# Uncomment the line below to round up segment sizes to full pages for
-# testing purposes only.
-#LDFLAGS += -Wl,-T,fullpage.x
-
-VPATH = ../..
-
-DEFINES = -DUSER
-CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/user \
-	   -include constants.h
-
-# C library sources linked into every test program.
-LIB_SRC  = lib/debug.c			# Debug code.
-LIB_SRC += lib/random.c			# Pseudo-random numbers.
-LIB_SRC += lib/stdio.c			# I/O library.
-LIB_SRC += lib/stdlib.c			# atoi()
-LIB_SRC += lib/string.c			# String functions.
-LIB_SRC += lib/user/syscall.c		# System calls.
-LIB_SRC += lib/user/syscall-stub.S	# System call stub.
-LIB_SRC += lib/user/console.c		# Console code.
-
-LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(LIB_SRC)))
-LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ))
-LIB = libc.a lib/user/entry.o
+SRCDIR = ../..
 
+# Test programs to compile, and a list of sources for each.
+# To add a new test, put its name on the PROGS list
+# and then add a name_SRC line that lists its source files.
 PROGS = bubsort echo halt insult lineup matmult recursor shell
 bubsort_SRC = bubsort.c
 echo_SRC = echo.c
@@ -39,33 +13,8 @@ matmult_SRC = matmult.c
 recursor_SRC = recursor.c
 shell_SRC = shell.c
 
-PROGS_SRC = $(foreach prog,$(PROGS),$($(prog)_SRC))
-PROGS_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(PROGS_SRC)))
-PROGS_DEP = $(patsubst %.o,%.d,$(PROGS_OBJ))
-
-all: $(PROGS)
+include $(SRCDIR)/Makefile.userprog
 
-define TEMPLATE
-$(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC)))
-$(1): $$($(1)_OBJ) $$(LIB) | ./lib/user
-endef
-
-./lib/user:
-	$(MKDIR) -p lib/user
-
-$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
-
-$(PROGS): $(LIB)
-
-libc.a: $(LIB_OBJ)
-	rm -f $@
-	ar r $@ $^
-	ranlib $@
-
-clean:
-	rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP)
-	rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a 
-
-.PHONY: all clean
-
--include $(LIB_DEP) $(PROGS_DEP)
+# Uncomment the line below to round up segment sizes to full pages for
+# testing purposes only.
+#LDFLAGS += -Wl,-T,fullpage.x