Commit de2d9bf4 authored by Caleb C. Sander's avatar Caleb C. Sander
Browse files

Report all test results when tests are re-run

parent 8773ee6e
No related merge requests found
Showing with 10 additions and 13 deletions
+10 -13
......@@ -11,14 +11,14 @@ TESTS_8 = $(TESTS_7) Arithmetic CoinSums DigitPermutations FunctionCall \
Goldbach IntegerTypes Jumps PalindromeProduct Primes Recursion
test: test8
test1: $(addprefix tests/,$(TESTS_1:=-result.txt))
test2: $(addprefix tests/,$(TESTS_2:=-result.txt))
test3: $(addprefix tests/,$(TESTS_3:=-result.txt))
test4: $(addprefix tests/,$(TESTS_4:=-result.txt))
test5: $(addprefix tests/,$(TESTS_5:=-result.txt))
test6: $(addprefix tests/,$(TESTS_6:=-result.txt))
test7: $(addprefix tests/,$(TESTS_7:=-result.txt))
test8: $(addprefix tests/,$(TESTS_8:=-result.txt))
test1: $(TESTS_1:=-result)
test2: $(TESTS_2:=-result)
test3: $(TESTS_3:=-result)
test4: $(TESTS_4:=-result)
test5: $(TESTS_5:=-result)
test6: $(TESTS_6:=-result)
test7: $(TESTS_7:=-result)
test8: $(TESTS_8:=-result)
jvm: jvm.o read_class.o
$(CC) $(CFLAGS) $^ -o $@
......@@ -32,11 +32,8 @@ tests/%-expected.txt: tests/%.class
tests/%-actual.txt: tests/%.class jvm
./jvm $< > $@
tests/%-result.txt: tests/%-expected.txt tests/%-actual.txt
diff -u $^ | tee $@; \
name='test $(@F:-result.txt=)'; \
if [ -s $@ ]; then echo FAILED $$name. Aborting.; false; \
else echo PASSED $$name.; fi
%-result: tests/%-expected.txt tests/%-actual.txt
diff -u $^ && echo PASSED test $(@:-result=). || (echo FAILED test $(@:-result=). Aborting.; false)
clean:
rm -f *.o jvm tests/*.txt `find tests -name '*.java' | sed 's/java/class/'`
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment