tools: test against openjdk

see `make test' after a change, to check if you broke something
hint: use `make -j8 test' or similar (depending on your machine...)

but note, it's only a high level test

diff --git a/Makefile b/Makefile
index 0f3f55c7df4193d64417f839729c38f919371df0..aacf0ffd44f1c4b48fc47cc92831dfc3fe6dd07a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@ SHELL := bash
 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=)
 HS_FILES := $(wildcard Mate/*.hs)
 HS_BOOT := $(wildcard Mate/*.hs-boot)
 O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
@@ -17,56 +19,10 @@ GHC_LD := -optl-Xlinker -optl-x
 
 all: mate $(CLASS_FILES)
 
-test: mate $(CLASS_FILES)
-       ./$< tests/While | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x19 0x19
-       ./$< tests/Fib | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x2ac2
-       ./$< tests/Fac | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x63e1a
-       ./$< tests/ArgumentPassing1 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x92 $$(((0 - 0x1337) & 0xffffffff))
-       ./$< tests/DifferentClass1 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 8 13
-       ./$< tests/Static1 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x33
-       ./$< tests/Static2 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x55
-       ./$< tests/Static3 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x6dd
-       ./$< tests/Static4 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x77
-       ./$< tests/Static5 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x33
-       ./$< tests/Static6 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x33
-       ./$< tests/Static7 | grep -e "^result"
-       @printf "should be:  0x%08x\n" $$((0x1337 + 0x555))
-       ./$< tests/Static8 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x33 $$((0x1337 + 0x555))
-       ./$< tests/CallConv1 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x1337
-       ./$< tests/CallConv2 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x1337
-       ./$< tests/CallConv3 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x 0x%08x 0x%08x\n" 0x1000 0x300 0x30 0x7
-       ./$< tests/Instance1 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x55 0x11
-       ./$< tests/Instance2 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x198 0x22
-       ./$< tests/Instance3 | grep -e "^result"
-       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x44
-       ./$< tests/Native2 | grep -e "^result"
-       @printf "should be:   0x%08x\n" 0x1337
-       ./$< tests/Native3 | egrep -e "^result"
-       @printf "should be: %s\n" "Hello World"
-       ./$< tests/Strings1 | egrep -c -e "^result"
-       @printf "should be: %d\n" 3
-       ./$< tests/Array1 | grep -e "^result"
-       @printf "should be:   0x%08x 0x%08x\n" 0x264 0x8
-       ./$< tests/Integer1 | grep -e "^result"
-       @printf "should be:  0x%08x\n" 0x1337
-       ./$< tests/VarArgs1 | grep -e "^result"
+test: $(TEST_CLASS_FILES)
+
+%: %.class mate
+       @./tools/openjdktest.sh $@
 
 %.class: %.java
        $(JAVAC) $<

diff --git a/tools/openjdktest.sh b/tools/openjdktest.sh
new file mode 100755 (executable)
index 0000000..2456d3b
--- /dev/null
+++ b/tools/openjdktest.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+class2test=$1
+
+openjdk="java -client"
+openjdk_output=`mktemp`
+mate=./mate
+mate_output=`mktemp`
+
+diff_output=`mktemp`
+
+$openjdk $class2test | grep -e '^result:' > $openjdk_output
+$mate $class2test | grep -e '^result:' > $mate_output
+
+diff $openjdk_output $mate_output > $diff_output
+
+diff_lines=`cat $diff_output | wc -l`
+
+
+if [ $diff_lines = 0 ]
+then
+       echo -e '\033[01;32mSUCCESS\033[0m: ' $class2test
+else
+       echo -en '\033[01;31mFAIL\033[0m:    ' $class2test
+       echo "                                diff:"
+       cat $diff_output
+fi
+
+
+rm -f $openjdk_output $mate_output $diff_output