# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1303989443 -7200
# Node ID b21123d5a69347c20aa67814f99029c8e451e08c
# Parent  b122bed75f04bff47c77614c9ded348c169c03a0
test scripts: use JDK7 env var, check all required vars

diff -r b122bed75f04 -r b21123d5a693 runbootstrap.sh
--- a/runbootstrap.sh	Thu Apr 28 10:40:49 2011 +0200
+++ b/runbootstrap.sh	Thu Apr 28 13:17:23 2011 +0200
@@ -1,2 +1,19 @@
 #!/bin/bash
-${GRAAL}/java64/bin/java -client -graal -version
+if [ -z "${JDK7}" ]; then
+  echo "JDK7 is not defined."
+  exit 1;
+fi
+if [ -z "${JDK7G}" ]; then
+  echo "JDK7G is not defined."
+  exit 1;
+fi
+if [ -z "${MAXINE}" ]; then
+  echo "MAXINE is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+if [ -z "${GRAAL}" ]; then
+  echo "GRAAL is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+${JDK7}/bin/java -client -graal -version
+${JDK7G}/bin/java -client -graal -version
diff -r b122bed75f04 -r b21123d5a693 rundacapo.sh
--- a/rundacapo.sh	Thu Apr 28 10:40:49 2011 +0200
+++ b/rundacapo.sh	Thu Apr 28 13:17:23 2011 +0200
@@ -1,2 +1,18 @@
 #!/bin/bash
-${GRAAL}/java64/bin/java -client -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar Harness $*
+if [ -z "${JDK7}" ]; then
+  echo "JDK7 is not defined."
+  exit 1;
+fi
+if [ -z "${MAXINE}" ]; then
+  echo "MAXINE is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+if [ -z "${GRAAL}" ]; then
+  echo "GRAAL is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+if [ -z "${DACAPO}" ]; then
+  echo "DACAPO is not defined. It must point to a SciMark benchmark directory."
+  exit 1;
+fi
+${JDK7}/bin/java -client -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar Harness $*
diff -r b122bed75f04 -r b21123d5a693 runscimark.sh
--- a/runscimark.sh	Thu Apr 28 10:40:49 2011 +0200
+++ b/runscimark.sh	Thu Apr 28 13:17:23 2011 +0200
@@ -7,6 +7,10 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
+if [ -z "${GRAAL}" ]; then
+  echo "GRAAL is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
 if [ -z "${SCIMARK}" ]; then
   echo "SCIMARK is not defined. It must point to a SciMark benchmark directory."
   exit 1;
diff -r b122bed75f04 -r b21123d5a693 runtests.sh
--- a/runtests.sh	Thu Apr 28 10:40:49 2011 +0200
+++ b/runtests.sh	Thu Apr 28 13:17:23 2011 +0200
@@ -1,2 +1,14 @@
 #!/bin/bash
-${GRAAL}/java64/bin/java -client -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/VM/bin" -Xbootclasspath/p:"${MAXINE}/Base/bin" test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${MAXINE}/VM/test/jtt/bytecode ${MAXINE}/VM/test/jtt/except ${MAXINE}/VM/test/jtt/hotpath ${MAXINE}/VM/test/jtt/jdk ${MAXINE}/VM/test/jtt/lang ${MAXINE}/VM/test/jtt/loop ${MAXINE}/VM/test/jtt/micro ${MAXINE}/VM/test/jtt/optimize ${MAXINE}/VM/test/jtt/reflect ${MAXINE}/VM/test/jtt/threads
+if [ -z "${JDK7}" ]; then
+  echo "JDK7 is not defined."
+  exit 1;
+fi
+if [ -z "${MAXINE}" ]; then
+  echo "MAXINE is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+if [ -z "${GRAAL}" ]; then
+  echo "GRAAL is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+${JDK7}/bin/java -client -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/VM/bin" -Xbootclasspath/p:"${MAXINE}/Base/bin" test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${MAXINE}/VM/test/jtt/bytecode ${MAXINE}/VM/test/jtt/except ${MAXINE}/VM/test/jtt/hotpath ${MAXINE}/VM/test/jtt/jdk ${MAXINE}/VM/test/jtt/lang ${MAXINE}/VM/test/jtt/loop ${MAXINE}/VM/test/jtt/micro ${MAXINE}/VM/test/jtt/optimize ${MAXINE}/VM/test/jtt/reflect ${MAXINE}/VM/test/jtt/threads