Use kopi compiler.

[cacao.git] / tests / jvm98 / Makefile.am

diff --git a/tests/jvm98/Makefile.am b/tests/jvm98/Makefile.am
index 532743a550fd542641ed7e3c4500836abe566001..49a9882985dceeb213855ba42f5f40caebfd7b09 100644 (file)
--- a/tests/jvm98/Makefile.am
+++ b/tests/jvm98/Makefile.am
@@ -1,20 +1,23 @@
-EXTRA_DIST = check.diff compress.diff compress.output db.diff db.output javac.diff javac.output mpegaudio.diff mpegaudio.output raytrace.diff raytrace.output jess.output jack.output
+EXTRA_DIST = check.diff compress.diff compress.output db.diff db.output javac.diff javac.output mpegaudio.diff mpegaudio.output raytrace.diff raytrace.output
+
+JAVA = ../../cacao
+JAVAC = $(JAVA) at.dms.kjc.Main
 
 checkjvm: compress db javac mpegaudio raytrace 
 
-compress db javac mpegaudio raytrace: force
+check compress db javac mpegaudio raytrace: force
        rm -rf $@
        cp -r ../jvm98/spec/benchmarks/_*_$@ $@
        patch -p0 < $@.diff
        (cd $@; \
         chmod 644 *; \
         chmod 755 input; \
-        sh setup.sh || true; \
-        ../../cacao  -ieee sun.tools.javac.Main -d . *.java  && \
-        ../../cacao  -ieee Main > $@.output; \
-        sh postoutput.sh || true; \
+        JAVA="$(JAVA)" JAVAC="$(JAVAC)" sh setup.sh || true; \
+        $(JAVAC) -d . *.java && \
+        $(JAVA) Main > $@.output; \
+        JAVA="$(JAVA)" JAVAC="$(JAVAC)" sh postoutput.sh || true; \
        )
        diff --brief $@/$@.output $@.output
        rm -rf $@
-       
+
 force: