include ../../Makefile.userprog
-PINTOSFLAGS += -v $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
+TIMEOUT = 60
+PINTOSFLAGS += -v -T $(TIMEOUT) \
+ $(foreach file,$(PUTFILES),-p $(file) -a $(notdir $(file)))
KERNELFLAGS += -q
+
PINTOS = pintos $(PINTOSOPTS) $(PINTOSFLAGS) -- $(KERNELFLAGS)
OUTPUTS = $(addsuffix .output,$(TESTS))
clean::
rm -f $(OUTPUTS) $(ERRORS) $(RESULTS)
-grade:: ../rubric.txt results
- @pass=; \
- for d in $(TESTS); do \
- if echo PASS | cmp -s $$d.result -; then \
- pass="$$pass $$d"; \
- fi \
- done; \
- $(SRCDIR)/tests/make-grade $< $$pass
+grade:: results
+ $(SRCDIR)/tests/make-grade $(SRCDIR) $< $(GRADING_FILE) | tee $@
check:: results
- @f=0; \
- n=0; \
- echo "Test summary:"; \
- for d in $(TESTS); do \
+ @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); do \
if echo PASS | cmp -s $$d.result -; then \
echo "pass $$d"; \
else \
echo "FAIL $$d"; \
- f=`expr $$f + 1`; \
fi; \
- n=`expr $$n + 1`; \
- done; \
- if [ $$f = 0 ]; then \
- echo "All $$n tests passed."; \
- else \
- echo "$$f of $$n tests failed."; \
- exit 1; \
- fi
+ done > $@
-results:: $(RESULTS)
outputs:: $(OUTPUTS)
$(foreach prog,$(PROGS),$(eval $(prog).output: $(prog)))