From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Mon, 14 Nov 2011 11:42:04 +0000 (+0000)
Subject: - Do not install sudo
X-Git-Tag: merge_30_head_take2_dst~42
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b7f4cecd0db1e87cf1e8075c5f997b26cf4e252b;p=jra1mw.git

- Do not install sudo
- the OTHER LB common
---

diff --git a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
index 1501aab..81e03b5 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
@@ -38,7 +38,6 @@ yum install -q -y globus-proxy-utils
 yum install -q -y voms-clients
 yum install -q -y curl
 yum install -q -y wget
-yum install -q -y sudo
 
 cd /tmp
 
diff --git a/org.glite.testsuites.ctb/PX/tests/px-test-all.sh b/org.glite.testsuites.ctb/PX/tests/px-test-all.sh
index 0220a85..bdf2fb9 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-test-all.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-test-all.sh
@@ -49,16 +49,16 @@ if [ ! -r ${COMMON} ]; then
 	exit 2
 fi
 source ${COMMON}
-if [ ! -r lb-common-testbeds.sh ]; then
-        printf "Downloading common definitions 'lb-common-testbeds.sh'"
-        wget -O lb-common-testbeds.sh http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh?view=co > /dev/null
-        if [ ! -r lb-common-testbeds.sh ]; then
+if [ ! -r lb-common.sh ]; then
+        printf "Downloading common definitions 'lb-common.sh'"
+        wget -O lb-common.sh http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.testsuites.ctb/LB/tests/lb-common.sh?view=co > /dev/null
+        if [ ! -r lb-common.sh ]; then
                 exit 2
         else
                 test_done
         fi
 fi
-source lb-common-testbeds.sh
+source lb-common.sh
 
 
 logfile=$$.tmp