Makefile: s/test/tests/g

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index f3a53a4c4f9e2121ac641af2df9217324d4a18fa..4fb6df1c6b99b0f73b11d013e6e72b2b417afa18 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 SHELL := bash
 
 JAVAC := javac
-JAVA_FILES := $(wildcard tests/*.java)
+JAVA_FILES := $(wildcard tests/*.java java/lang/*.java java/io/*.java)
 CLASS_FILES := $(JAVA_FILES:.java=.class)
+TEST_JAVA_FILES := $(wildcard tests/*.java)
+TEST_CLASS_FILES := $(TEST_JAVA_FILES:.java=)
 HS_FILES := $(wildcard Mate/*.hs)
+HS_BOOT := $(wildcard Mate/*.hs-boot)
 O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
 PACKAGES_ := bytestring harpy hs-java
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
@@ -16,18 +19,10 @@ GHC_LD := -optl-Xlinker -optl-x
 
 all: mate $(CLASS_FILES)
 
-test: mate $(CLASS_FILES)
-       ./$< tests/Fib.class | grep mainresult
-       @printf "should be:  0x%08x\n" 0x09de8d6d
-       ./$< tests/Fac.class | grep mainresult
-       @printf "should be:  0x%08x\n" 0x58980
-       ./$< tests/ArgumentPassing1.class | grep mainresult
-       @printf "should be:  0x%08x\n" 0x92
-       @printf "should be:  0x%08x\n" $$(((0 - 0x1337) & 0xffffffff))
-       ./$< tests/DifferentClass1.class | grep mainresult
-       @printf "should be:  0x%08x\n" 8
-       @printf "should be:  0x%08x\n" 13
-       ./$< tests/Native1.class | egrep -i -e '^printsomething: '
+tests: mate $(TEST_CLASS_FILES)
+
+%: %.class mate
+       @./tools/openjdktest.sh $@
 
 %.class: %.java
        $(JAVAC) $<
@@ -35,11 +30,11 @@ test: mate $(CLASS_FILES)
 ffi/native.o: ffi/native.c
        ghc -Wall -O2 -c $< -o $@
 
-mate: Mate.hs ffi/trap.c $(HS_FILES) ffi/native.o
+mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
        ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD)
 
 clean:
-       rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o mate tests/*.class
+       rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o Mate/*.{hi,o}-boot mate tests/*.class
 
 ghci: mate
        ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)