changeset 13:7577d55a0e30 draft

Various fixes in the script build_all.sh.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Thu, 17 Apr 2014 10:00:43 +0200
parents b14d38ca6619
children 711b58cbbb72
files ChangeLog tck7/build_all.sh
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 16 13:56:49 2014 +0200
+++ b/ChangeLog	Thu Apr 17 10:00:43 2014 +0200
@@ -1,3 +1,8 @@
+2014-04-17  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* tck7/build_all.sh:
+	Various fixes in the script build_all.sh.
+
 2014-04-15  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* tck7/scripts/readme.txt:
--- a/tck7/build_all.sh	Wed Apr 16 13:56:49 2014 +0200
+++ b/tck7/build_all.sh	Thu Apr 17 10:00:43 2014 +0200
@@ -59,7 +59,7 @@
     for tst in ${TESTS}
     do
         test_name=JCK-${tst}-${JCKVERSION}
-        workdir=${WORKROOT}/${DATE}-${1}/${tst}
+        WORKDIR=${WORKROOT}/${DATE}-${1}/${tst}
         mkdir -p ${REPORTDIR}/${tst}
         mkdir -p ${workdir}
 
@@ -67,7 +67,7 @@
         export PATH="${JCKROOT}/${test_name}/linux/bin;${ORIG_PATH}"
 
         java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/${test_name}/lib/javatest.jar \
-         -workdir ${workdir} \
+         -workdir ${WORKDIR} \
          -open ${JCKROOT}/${tst}-config.jti \
          -verbose:progress -runtests \
          -writeReport ${REPORTDIR}/${tst}
@@ -84,14 +84,15 @@
 
 function finish_tck()
 {
-    REPORTDIR=${JCKROOT}/results/${DATE}-${1}
+    REPORTDIR=${JCK_DIR}/results/${DATE}-${1}
     echo "Processing ${REPORTDIR}"
     for tst in ${TESTS}
     do
+        test_name=JCK-${tst}-${JCKVERSION}
         echo "    Test: ${tst}"
-        WORKDIR=${JCKROOT}/work/${DATE}-${1}/${tst}
+        WORKDIR=${WORKROOT}/${DATE}-${1}/${tst}
         CONFIG=${JCKROOT}/${tst}-config.jti
-        java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-${tst}-7/lib/javatest.jar \
+        java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/${test_name}/lib/javatest.jar \
              -workDir ${WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \