changeset 17:4320e01c478a draft

Minor fixes, sync with work copy.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Tue, 22 Apr 2014 11:17:53 +0200
parents 7aa7620641a5
children a75e3cbf5b1c
files ChangeLog tck7/scripts/c1.sh tck7/scripts/c2.sh tck7/scripts/c3.sh tck7/scripts/l1.sh tck7/scripts/l2.sh tck7/scripts/l3.sh tck7/scripts/r1.sh tck7/scripts/r2.sh tck7/scripts/r3.sh
diffstat 10 files changed, 140 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 18 11:41:59 2014 +0200
+++ b/ChangeLog	Tue Apr 22 11:17:53 2014 +0200
@@ -1,3 +1,16 @@
+2014-04-22  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* tck7/scripts/c1.sh:
+	* tck7/scripts/c2.sh:
+	* tck7/scripts/c3.sh:
+	* tck7/scripts/l1.sh:
+	* tck7/scripts/l2.sh:
+	* tck7/scripts/l3.sh:
+	* tck7/scripts/r1.sh:
+	* tck7/scripts/r2.sh:
+	* tck7/scripts/r3.sh:
+	Minor fixes, sync with work copy.
+
 2014-04-18  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* tck7/results.sh:
--- a/tck7/scripts/c1.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/c1.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/compiler-config.jti
+CONFIG=${JCK_DIR}/compiler-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-1/compiler
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-1/compiler
+
+TESTED_JDK_NAME=Icedtea7_forest
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-compiler-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-compiler-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/c2.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/c2.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/compiler-config.jti
+CONFIG=${JCK_DIR}/compiler-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-2/compiler
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-2/compiler
+
+TESTED_JDK_NAME=Icedtea7_forest_2_3
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-compiler-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-compiler-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/c3.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/c3.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/compiler-config.jti
+CONFIG=${JCK_DIR}/compiler-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-3/compiler
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-3/compiler
+
+TESTED_JDK_NAME=Icedtea7_forest_2_4
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-compiler-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-compiler-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/l1.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/l1.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/devtools-config.jti
+CONFIG=${JCK_DIR}/devtools-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-1/devtools
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-1/devtools
+
+TESTED_JDK_NAME=Icedtea7_forest
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-devtools-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-devtools-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/l2.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/l2.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/devtools-config.jti
+CONFIG=${JCK_DIR}/devtools-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-2/devtools
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-2/devtools
+
+TESTED_JDK_NAME=Icedtea7_forest_2_3
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-devtools-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-devtools-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/l3.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/l3.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/devtools-config.jti
+CONFIG=${JCK_DIR}/devtools-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-3/devtools
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-3/devtools
+
+TESTED_JDK_NAME=Icedtea7_forest_2_4
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-devtools-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-devtools-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/r1.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/r1.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/runtime-config.jti
+CONFIG=${JCK_DIR}/runtime-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-1/runtime
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-1/runtime
+
+TESTED_JDK_NAME=Icedtea7_forest
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-runtime-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-runtime-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/r2.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/r2.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,25 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/runtime-config.jti
+CONFIG=${JCK_DIR}/runtime-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-2/runtime
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-2/runtime
+
+TESTED_JDK_NAME=Icedtea7_forest_2_3
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest_2_3/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-runtime-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-runtime-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error
--- a/tck7/scripts/r3.sh	Fri Apr 18 11:41:59 2014 +0200
+++ b/tck7/scripts/r3.sh	Tue Apr 22 11:17:53 2014 +0200
@@ -41,19 +41,26 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
-CONFIG=${JCKROOT}/7/runtime-config.jti
+CONFIG=${JCK_DIR}/runtime-config.jti
 DATE=`date +%Y%m%d`
-WORKDIR=${JCKROOT}/work/${DATE}-3/runtime
+CURRENT_WORKDIR=${WORK_DIR}/${DATE}-3/runtime
+
+TESTED_JDK_NAME=Icedtea7_forest_2_4
 
-rm ${JCKROOT}/7/jdk
-ln -s -T ${DAILY_TESTS_DIR}/builds/Icedtea7_forest_2_4/openjdk/build/linux-amd64/j2sdk-image/ ${JCKROOT}/7/jdk
-cd ${JCKROOT}/7
+rm ${JCK_DIR}/jdk
+ln -s -T ${DAILY_TESTS_DIR}/builds/${TESTED_JDK_NAME}/openjdk/build/linux-amd64/j2sdk-image/ ${JCK_DIR}/jdk
+cd ${JCK_DIR}
 
-java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCKROOT}/7/JCK-runtime-7/lib/javatest.jar \
-             -workDir ${WORKDIR} \
+java -Xms128m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=512m -jar ${JCK_DIR}/JCK-runtime-7/lib/javatest.jar \
+             -workDir ${CURRENT_WORKDIR} \
              -config ${CONFIG} \
              -verbose:progress \
              -priorStatus passed,fail,error