varargs: make printf working

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index fb4b5bcda9b4040ed5858b06c20ae4e373ae665a..87aca3b6201941f6e8a9ae1ab9ffec5fbac91138 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +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)
 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_))
@@ -33,6 +34,41 @@ test: mate $(CLASS_FILES)
        @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/CallConv3 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x 0x%08x 0x%08x\n" 0x1000 0x300 0x30 0x7
+       ./$< tests/Instance1 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x55 0x11
+       ./$< tests/Instance2 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x198 0x22
+       ./$< tests/Instance3 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x44
+       ./$< tests/Instance4 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x1337 0x1337
+       ./$< tests/Native2 | grep "printstream"
+       @printf "should be:   0x%08x\n" 0x1337
+       ./$< tests/Native3 | egrep -e "^Hello World"
+       @printf "should be: %s\n" "Hello World"
+       ./$< tests/Strings1 | egrep -c -e "^okay :-\)"
+       @printf "should be: %d\n" 3
+       ./$< tests/Array1 | grep "printstream"
+       @printf "should be:   0x%08x 0x%08x\n" 0x264 0x8
+       ./$< tests/Integer1 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x1337
+       ./$< tests/VarArgs1 | grep mainresult
 
 %.class: %.java
        $(JAVAC) $<
@@ -40,11 +76,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)