test: cleanup scripts for test

Author: mopp

Makefile

@@ -15,14 +15,17 @@ $(MM): $(OBJS)
 
 $(OBJS): $(HEADERS)
 
-.PHONY: selfhost
-selfhost: $(MMS)
-
 $(MMS): $(MM)
 	cat $(SRCS) > src/self.c
 	$(MM) ./src/self.c > ./src/self.s
 	$(CC) $(AFLAGS) ./src/self.s -o $@
 
+.PHONY: test
+test: $(TEST_MM) src/lib.o
+	$(TEST_MM) --test
+	./test.sh $(TEST_MM)
+	make -s $(TESTS_DIFFS) TEST_MM=$(TEST_MM)
+
 .PHONY: diffs
 diffs: $(TESTS_DIFFS)
 
@@ -32,11 +35,12 @@ diffs: $(TESTS_DIFFS)
 	./$*.bin > $*.out
 	diff $*.ans $*.out | tee $*.diff
 
-.PHONY: test
-test: $(MM) src/lib.o
-	$(MM) --test
-	./test.sh
-	make -s $(TESTS_DIFFS)
+.PHONY: selfhost
+selfhost: $(MMS)
+
+.PHONY: test_selfhost
+test_selfhost: $(MMS)
+	make -s test TEST_MM=$(MMS)
 
 .PHONY: clean
 clean:

test.sh

@@ -1,11 +1,13 @@
 ##!/bin/bash
 
+TEST_TARGET=$1
+
 try() {
     expected="$1"
     input="$2"
 
-    echo "./9mm '$input'"
-    ./9mm --str "$input" >tmp.s
+    echo "$TEST_TARGET --str '$input'"
+    $TEST_TARGET --str "$input" >tmp.s
     if [[ "$?" != "0" ]]; then
         echo 'Compilation error'
         exit 1