From 4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Tue, 27 Mar 2012 11:51:08 +0200
Subject: reorganize file structure to match the upstream requirements

---
 pintos-progos/tests/Make.tests | 76 ------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 pintos-progos/tests/Make.tests

(limited to 'pintos-progos/tests/Make.tests')

diff --git a/pintos-progos/tests/Make.tests b/pintos-progos/tests/Make.tests
deleted file mode 100644
index 358e697..0000000
--- a/pintos-progos/tests/Make.tests
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- makefile -*-
-
-include $(patsubst %,$(SRCDIR)/%/Make.tests,$(TEST_SUBDIRS))
-
-PROGS = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_PROGS))
-TESTS = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_TESTS))
-EXTRA_GRADES = $(foreach subdir,$(TEST_SUBDIRS),$($(subdir)_EXTRA_GRADES))
-
-OUTPUTS = $(addsuffix .output,$(TESTS) $(EXTRA_GRADES))
-ERRORS = $(addsuffix .errors,$(TESTS) $(EXTRA_GRADES))
-RESULTS = $(addsuffix .result,$(TESTS) $(EXTRA_GRADES))
-
-ifdef PROGS
-include ../../Makefile.userprog
-endif
-
-TIMEOUT = 60
-
-clean::
-	rm -f $(OUTPUTS) $(ERRORS) $(RESULTS) 
-
-grade:: results
-	$(SRCDIR)/tests/make-grade $(SRCDIR) $< $(GRADING_FILE) | tee $@
-
-check:: results
-	@cat $<
-	@COUNT="`egrep '^(pass|FAIL) ' $< | wc -l | sed 's/[ 	]//g;'`"; \
-	FAILURES="`egrep '^FAIL ' $< | wc -l | sed 's/[ 	]//g;'`"; \
-	if [ $$FAILURES = 0 ]; then					  \
-		echo "All $$COUNT tests passed.";			  \
-	else								  \
-		echo "$$FAILURES of $$COUNT tests failed.";		  \
-		exit 1;							  \
-	fi
-
-results: $(RESULTS)
-	@for d in $(TESTS) $(EXTRA_GRADES); do			\
-		if echo PASS | cmp -s $$d.result -; then	\
-			echo "pass $$d";			\
-		else						\
-			echo "FAIL $$d";			\
-		fi;						\
-	done > $@
-
-outputs:: $(OUTPUTS)
-
-$(foreach prog,$(PROGS),$(eval $(prog).output: $(prog)))
-$(foreach test,$(TESTS),$(eval $(test).output: $($(test)_PUTFILES)))
-$(foreach test,$(TESTS),$(eval $(test).output: TEST = $(test)))
-
-# Prevent an environment variable VERBOSE from surprising us.
-VERBOSE =
-
-TESTCMD = pintos -v -k -T $(TIMEOUT)
-TESTCMD += $(SIMULATOR)
-TESTCMD += $(PINTOSOPTS)
-ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)
-TESTCMD += $(FILESYSSOURCE)
-TESTCMD += $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
-endif
-ifeq ($(filter vm, $(KERNEL_SUBDIRS)), vm)
-TESTCMD += --swap-size=4
-endif
-TESTCMD += -- -q
-TESTCMD += $(KERNELFLAGS)
-ifeq ($(filter userprog, $(KERNEL_SUBDIRS)), userprog)
-TESTCMD += -f
-endif
-TESTCMD += $(if $($(TEST)_ARGS),run '$(*F) $($(TEST)_ARGS)',run $(*F))
-TESTCMD += < /dev/null
-TESTCMD += 2> $(TEST).errors $(if $(VERBOSE),|tee,>) $(TEST).output
-%.output: kernel.bin loader.bin
-	$(TESTCMD)
-
-%.result: %.ck %.output
-	perl -I$(SRCDIR) $< $* $@
-- 
cgit v1.2.3