X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=6a1922e79407a05857bb3a1d5334e1466570f705;hb=4acc971dbcafd34fa7f5716513ae4dd47e0ea0eb;hp=3c004ec808a9f4e9ecdacd7b0094ffc42a6b42e3;hpb=b6e379114b45fca215e766816e9db94199bb4f00;p=mate.git

diff --git a/Makefile b/Makefile
index 3c004ec..6a1922e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 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)
@@ -17,41 +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/Static6 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x33
-	./$< tests/Static7 | grep mainresult
-	@printf "should be:  0x%08x\n" $$((0x1337 + 0x555))
-	./$< tests/Static8 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 0x33 $$((0x1337 + 0x555))
-	./$< tests/CallConv1 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x1337
-	./$< tests/CallConv2 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x1337
-	./$< tests/Instance1 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 0x55 0x11
-	./$< tests/Instance2 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x198
+tests: mate $(TEST_CLASS_FILES)
+
+%: %.class mate
+	@./tools/openjdktest.sh $@
 
 %.class: %.java
 	$(JAVAC) $<
@@ -60,10 +31,19 @@ ffi/native.o: ffi/native.c
 	ghc -Wall -O2 -c $< -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)
+	@mkdir -p build/release
+	ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir build/release
+
+%.dbg: %.class mate.dbg
+	./mate.dbg $(basename $<)
+
+mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
+	@mkdir -p build/debug/{ffi,Mate,}
+	gcc -Wall -DDEBUG -O0 -c ffi/trap.c -o build/debug/ffi/trap.o
+	ghc --make -DDEBUG $(GHC_OPT) Mate.hs build/debug/ffi/trap.o -o $@ $(GHC_LD) -outputdir build/debug
 
 clean:
-	rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o Mate/*.{hi,o}-boot mate tests/*.class
+	rm -rf build mate mate.dbg ffi/native.o tests/*.class
 
 ghci: mate
 	ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)