strings: put every String from the constantpool in a Map

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index 4a5863d35d0f0a83cd2d2e782883aec1871ac07b..57f77e22d94bfed98ea4d0633fc7522559283fc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 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)
@@ -53,7 +53,15 @@ test: mate $(CLASS_FILES)
        ./$< 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
+       @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/Native2 | grep "Hello World"
+       @printf "should be: %s" "Hello World"
 
 %.class: %.java
        $(JAVAC) $<