From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 5 Nov 2012 17:13:06 +0000 (+0000)
Subject: Propagate the install or test error up (although not used right now, the error will... 
X-Git-Tag: glite-jobid-api-c_R_2_2_4_1~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=60f6f62b24ed62f98ab907d3b23f4ba373dce991;p=jra1mw.git

Propagate the install or test error up (although not used right now, the error will at least appear in testsuite.log).
---

diff --git a/org.glite.testsuites.ctb/CANL-C/tests/canl-autonomous-test.sh b/org.glite.testsuites.ctb/CANL-C/tests/canl-autonomous-test.sh
index 225a89f..b887039 100755
--- a/org.glite.testsuites.ctb/CANL-C/tests/canl-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-autonomous-test.sh
@@ -101,12 +101,10 @@ test_done
 
 
 printf "Installing... "
-sh caNlInstall.sh > Install_log.txt 2> Install_err.log
-test_done
+sh caNlInstall.sh > Install_log.txt 2> Install_err.log && test_done || test_failed
 
 printf "Running tests... "
-sh arrange_canl_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log
-test_done
+sh arrange_canl_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log && test_done || test_failed
 
 printf "Collecting package list... "
 gen_repo_lists ./prod_packages.txt ./repo_packages.txt
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
index db73b80..fbdea62 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
@@ -104,12 +104,10 @@ test_done
 
 
 printf "Installing... "
-sh LBinstall.sh > Install_log.txt 2> Install_err.log
-test_done
+sh LBinstall.sh > Install_log.txt 2> Install_err.log && test_done || test_failed
 
 printf "Running tests... "
-sh arrange_lb_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log
-test_done
+sh arrange_lb_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log && test_done || test_failed
 
 printf "Collecting package list... "
 gen_repo_lists ./prod_packages.txt ./repo_packages.txt
diff --git a/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh b/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh
index 30ad6fe..e469023 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh
@@ -127,12 +127,10 @@ test_done
 
 
 printf "Installing... "
-sh PXinstall.sh > Install_log.txt 2> Install_err.log
-test_done
+sh PXinstall.sh > Install_log.txt 2> Install_err.log && test_done || test_failed
 
 printf "Running tests... "
-sh arrange_px_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log
-test_done
+sh arrange_px_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log && test_done || test_failed
 
 printf "Collecting package list... "
 gen_repo_lists ./prod_packages.txt ./repo_packages.txt
diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
index d3733c6..2171a5b 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
@@ -105,12 +105,10 @@ test_done
 
 
 printf "Installing... "
-sh GridSiteInstall.sh > Install_log.txt 2> Install_err.log
-test_done
+sh GridSiteInstall.sh > Install_log.txt 2> Install_err.log && test_done || test_failed
 
 printf "Running tests... "
-sh arrange_gridsite_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log
-test_done
+sh arrange_gridsite_test_root.sh none glite 80 '-x' > test_log.txt 2> test_err.log && test_done || test_failed
 
 printf "Collecting package list... "
 gen_repo_lists ./prod_packages.txt ./repo_packages.txt