From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 2 Mar 2011 20:19:33 +0000 (+0000)
Subject: Update locations.
X-Git-Tag: glite-jobid-api-java_R_1_1_2_1~16
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3b8fad1d8546561632546e868b7e7b5cab780d75;p=jra1mw.git

Update locations.
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index 6fef4cf..a65f66e 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -35,7 +35,8 @@ source ${TEST_COMMON}
 ulimit -c unlimited
 
 # define variables
-GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
+GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-/opt/glite}
+GLITE_LOCATION=${GLITE_LB_LOCATION}
 SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
 PATH=$GLITE_LOCATION/bin:$GLITE_LOCATION/examples:$PATH
 for libdir in lib lib64; do
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl b/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl
index 4958ee1..544ea8d 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-purge.pl
@@ -19,7 +19,8 @@
 use Term::ANSIColor;
 
 BEGIN{
-$inst = $ENV{GLITE_LOCATION};
+$inst = $ENV{GLITE_LB_LOCATION};
+$inst = $ENV{GLITE_LOCATION} unless $inst;
 $inst = "/opt/glite" unless $inst;
 $sbin = "$inst/sbin";
 $bin = "$inst/bin";