refactor: rename types (more consistent style)

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index 74652f5cac55276a79e7beb7db0c38dedd20af14..48f9c92748f7fdc39a9130593816af6e1327d759 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,31 +19,10 @@ GHC_LD := -optl-Xlinker -optl-x
 
 all: mate $(CLASS_FILES)
 
-test: mate $(CLASS_FILES)
-       ./$< tests/Fib | grep mainresult
-       @printf "should be:  0x%08x\n" 0x2ac2
-       ./$< tests/Fac | grep mainresult
-       @printf "should be:  0x%08x\n" 0x63e1a
-       ./$< tests/ArgumentPassing1 | grep mainresult
-       @printf "should be:  0x%08x 0x%08x\n" 0x92 $$(((0 - 0x1337) & 0xffffffff))
-       ./$< tests/DifferentClass1 | grep mainresult
-       @printf "should be:  0x%08x 0x%08x\n" 8 13
-       ./$< tests/Native1 | egrep -i -e '^printsomething: '
-       @printf "should be:  woot 0x%08x 0x%08x woot 0x%08x\n" 0x1337 0x1338 0x15a5
-       ./$< tests/Static1 | grep mainresult
-       @printf "should be:  0x%08x\n" 0x33
-       ./$< tests/Static2 | grep mainresult
-       @printf "should be:  0x%08x\n" 0x55
-       ./$< tests/Static3 | grep mainresult
-       @printf "should be:  0x%08x\n" 0x6dd
-       ./$< tests/Static4 | grep mainresult
-       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x77
-       ./$< tests/Static5 | grep mainresult
-       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x33
-       ./$< tests/CallConv1 | grep mainresult
-       @printf "should be:  0x%08x\n" 0x1337
-       ./$< tests/CallConv2 | grep mainresult
-       @printf "should be:  0x%08x\n" 0x1337
+test: mate $(TEST_CLASS_FILES)
+
+%: %.class mate
+       @./tools/openjdktest.sh $@
 
 %.class: %.java
        $(JAVAC) $<
@@ -48,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)