changeset 4:a9fd0830352b draft

Scripts should not use absolute path names.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Fri, 04 Apr 2014 13:13:19 +0200
parents e0c800ba69f7
children aa8fb6fa2243
files ChangeLog tck7/build_all.sh tck7/clean_all.sh tck7/dailytests.dir tck7/jck.dir
diffstat 5 files changed, 35 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 03 10:20:06 2014 +0200
+++ b/ChangeLog	Fri Apr 04 13:13:19 2014 +0200
@@ -1,3 +1,11 @@
+2014-04-04  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* tck7/build_all.sh:
+	* tck7/clean_all.sh:
+	* tck7/dailytests.dir:
+	* tck7/jck.dir:
+	Scripts should not use absolute path names.
+
 2014-04-03  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* tck7/build_all.sh:
--- a/tck7/build_all.sh	Thu Apr 03 10:20:06 2014 +0200
+++ b/tck7/build_all.sh	Fri Apr 04 13:13:19 2014 +0200
@@ -41,17 +41,20 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
+JCK_DIR=`cat jck.dir`
+DAILY_TESTS_DIR=`cat dailytests.dir`
+
 TESTS="compiler devtools runtime"
 JCKVERSION=7
-WORKROOT=/jck/work
-JCKROOT=/jck/7
+WORKROOT=${JCK_DIR}/work
+JCKROOT==${JCK_DIR}/7
 DATE=`date +%Y%m%d`
 
 exec > logs/build_$DATE.log 2>&1
 
 function run_tck()
 {
-    REPORTDIR=/jck/results/${DATE}-${1}
+    REPORTDIR=${JCK_DIR}/results/${DATE}-${1}
     export DISPLAY=:0.0
     for tst in ${TESTS}
     do
@@ -137,13 +140,13 @@
 
 cp cfg/repo_url_icedtea7_forest.txt cfg/repo_urls.txt
 ./run.lua
-remove_other_dirs /jck/daily_tests/builds/Icedtea7_forest/openjdk
+remove_other_dirs ${DAILY_TESTS_DIR}/builds/Icedtea7_forest/openjdk
 
 cp cfg/repo_url_icedtea7_forest_2_3.txt cfg/repo_urls.txt
 ./run.lua
-remove_other_dirs /jck/daily_tests/builds/Icedtea7_forest_2_3/openjdk
+remove_other_dirs ${DAILY_TESTS_DIR}/builds/Icedtea7_forest_2_3/openjdk
 
 cp cfg/repo_url_icedtea7_forest_2_4.txt cfg/repo_urls.txt
 ./run.lua
-remove_other_dirs /jck/daily_tests/builds/Icedtea7_forest_2_4/openjdk
+remove_other_dirs ${DAILY_TESTS_DIR}/builds/Icedtea7_forest_2_4/openjdk
 
--- a/tck7/clean_all.sh	Thu Apr 03 10:20:06 2014 +0200
+++ b/tck7/clean_all.sh	Fri Apr 04 13:13:19 2014 +0200
@@ -41,26 +41,26 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
+JCK_DIR=`cat jck.dir`
+DAILY_TESTS_DIR=`cat dailytests.dir`
+
 echo "Cleaning builds"
-rm -rf /jck/daily_tests/builds/Icedtea7_forest
-rm -rf /jck/daily_tests/builds/Icedtea7_forest_2_3
-rm -rf /jck/daily_tests/builds/Icedtea7_forest_2_4
+rm -rf ${DAILY_TESTS_DIR}/builds/Icedtea7_forest
+rm -rf ${DAILY_TESTS_DIR}/builds/Icedtea7_forest_2_3
+rm -rf ${DAILY_TESTS_DIR}/builds/Icedtea7_forest_2_4
 
 echo "Cleaning logs"
-rm -rf /jck/daily_tests/logs/*
+rm -rf ${DAILY_TESTS_DIR}/logs/*
 
 echo "Cleaning jtr"
-rm -rf /jck/daily_tests/jtr/20*
-
-echo "Cleaning /jck/log/"
-rm -rf /jck/log/*
+rm -rf  ${DAILY_TESTS_DIR}/jtr/20*
 
-echo "Cleaning /jck/logs/"
-rm -rf /jck/logs/*
+echo "Cleaning ${JCK_DIR}/log/"
+rm -rf ${JCK_DIR}/log/*
+echo "Cleaning ${JCK_DIR}/logs/"
+rm -rf ${JCK_DIR}/logs/*
+echo "Cleaning ${JCK_DIR}/work/"
+rm -rf ${JCK_DIR}/work/*
+echo "Cleaning ${JCK_DIR}/results/"
+rm -rf ${JCK_DIR}/results/*
 
-echo "Cleaning /jck/work/"
-rm -rf /jck/work/*
-
-echo "Cleaning /jck/results/"
-rm -rf /jck/results/*
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tck7/dailytests.dir	Fri Apr 04 13:13:19 2014 +0200
@@ -0,0 +1,1 @@
+/jck/daily_tests
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tck7/jck.dir	Fri Apr 04 13:13:19 2014 +0200
@@ -0,0 +1,1 @@
+/jck