@@ -59,8 +59,8 @@ tests/%.class: tests/%.java
5959tests/% -expected.out : tests/% .class
6060 $(Q )$(JAVA ) -cp tests $(*F ) > $@
6161
62- tests/% -actual.out : tests/% .class jvm
63- $(Q ) ./jvm $< > $@
62+ tests/% -actual.out : tests/% .class $( BIN )
63+ $(Q ) ./$( BIN ) $< > $@
6464
6565tests/% -result.out : tests/% -expected.out tests/% -actual.out
6666 $(Q ) diff -u $^ | tee $@ ; \
@@ -69,21 +69,21 @@ tests/%-result.out: tests/%-expected.out tests/%-actual.out
6969 if [ -s $@ ]; then $( PRINTF) $$ name. Aborting.; false ; \
7070 else $(call pass) ; fi
7171
72- tests/% -leak.out : tests/% .class jvm
73- $(Q ) valgrind ./jvm $< > $@ 2>&1 ; \
72+ tests/% -leak.out : tests/% .class $( BIN )
73+ $(Q ) valgrind ./$( BIN ) $< > $@ 2>&1 ; \
7474 name=' test $(@F:-leak.out=)' ; \
7575 $(PRINTF ) " Running $$ name..." ; \
7676 if grep -q ' All heap blocks were freed' $@ ; \
7777 then $(call pass) ; \
7878 else $(PRINTF ) FAILED $$ name. Aborting.; false ; fi
7979
8080clean :
81- $(Q )$(RM ) $(OBJS ) $(deps ) * ~ jvm tests/* .out tests/* .class $(REDIR )
81+ $(Q )$(RM ) $(OBJS ) $(deps ) * ~ $( BIN ) * .out tests/* .class $(REDIR )
8282
8383.PRECIOUS : % .o tests/% .class tests/% -expected.out tests/% -actual.out tests/% -result.out tests/% -leak.out
8484
8585indent :
86- clang-format -i * .c * .h
87- cloc jvm.c
86+ clang-format -i * .[ch]
87+ cloc * .[ch]
8888
8989-include $(deps )
0 commit comments