Makefile: optional call file for testcases

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fe827e16f442936c1c00fba044264e5a4db70a3..48a1b4085ef31f34394ffa0c4e6a99ec7eeb5063 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ JAVAC := javac
 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=)
+TEST_CLASS_FILES := $(TEST_JAVA_FILES:.java=.test)
 HS_FILES := $(wildcard Mate/*.hs)
 HS_BOOT := $(wildcard Mate/*.hs-boot)
 O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
@@ -19,13 +19,24 @@ GHC_LD := -optl-Xlinker -optl-x
 
 all: mate $(CLASS_FILES)
 
+%: %.class mate
+       ./mate $(basename $<)
+
+
 tests: mate $(TEST_CLASS_FILES)
 
-%: %.class mate
-       @./tools/openjdktest.sh $@
+CALLF = $(basename $@).call
+testcase = ./tools/openjdktest.sh "$(1) $(basename $@)"
+%.test: %.class mate
+       @if [ -f $(CALLF) ]; \
+               then $(call testcase,`cat $(CALLF)`); \
+               else $(call testcase, ); fi
 
+COMPILEF = $(basename $@).compile
 %.class: %.java
-       $(JAVAC) $<
+       @if [ -f $(COMPILEF) ]; \
+               then $(SHELL) $(COMPILEF); \
+               else $(JAVAC) $<; fi
 
 ffi/native.o: ffi/native.c
        ghc -Wall -O2 -c $< -o $@
@@ -48,7 +59,7 @@ mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
        ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs build/debug/ffi/trap.o -o $@ $(GHC_LD) -outputdir build/debug
 
 clean:
-       rm -rf build mate mate.dbg ffi/native.o tests/*.class
+       rm -rf build mate mate.dbg ffi/native.o tests/*.class Mate/*_stub.*
 
 ghci: mate
        ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)
@@ -57,3 +68,12 @@ tags: mate
        @# @-fforce-recomp, see
        @# http://stackoverflow.com/questions/7137414/how-do-i-force-interpretation-in-hint
        ghc -fforce-recomp -e :ctags $(PACKAGES) $(HS_FILES) $(O_FILES) Mate.hs
+
+hlint:
+       @# hlint isn't able to evaluate CPP comments correctly *sigh*
+       @cp debug.h debug_tmp.h
+       @# so we remove them "by hand", for hlint
+       @gcc -E -x c -fpreprocessed -dD -E debug_tmp.h | grep -v 'debug_tmp.h' > debug.h
+       @# ignore error code from hlint
+       -hlint Mate.hs Mate/
+       @mv debug_tmp.h debug.h