From ef7b55e27b30fc9a0e51ae13c6927250fd92bd04 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 7 Nov 2012 14:55:46 +0000
Subject: [PATCH] Update default GLITE_LOCATION. For canl, gridsite and px it
 shouldn't be needed.

---
 org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh     | 16 ++++++++--------
 org.glite.testsuites.ctb/LB/tests/lb-common.sh           |  2 +-
 org.glite.testsuites.ctb/PX/tests/px-common.sh           |  8 ++++----
 .../gridsite/tests/gridsite-common.sh                    |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh b/org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh
index a40a3f6..592c227 100755
--- a/org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh
+++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh
@@ -35,14 +35,14 @@ source ${TEST_COMMON}
 ulimit -c unlimited
 
 # define variables
-GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-$GLITE_LOCATION}
-GLITE_LOCATION=${GLITE_LOCATION:-'/opt/glite'}
-SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
-for dir in $GLITE_LOCATION $GLITE_LOCATION/lib64/glite-lb $GLITE_LOCATION/lib/glite-lb; do
-	if test -d "$dir/examples"; then PATH="$dir/examples:$PATH"; fi
-done
-PATH="$GLITE_LOCATION/bin:$PATH"
-export PATH
+#GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-$GLITE_LOCATION}
+#GLITE_LOCATION=${GLITE_LOCATION:-'/usr'}
+#SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
+#for dir in $GLITE_LOCATION $GLITE_LOCATION/lib64/glite-lb $GLITE_LOCATION/lib/glite-lb; do
+#	if test -d "$dir/examples"; then PATH="$dir/examples:$PATH"; fi
+#done
+#PATH="$GLITE_LOCATION/bin:$PATH"
+#export PATH
 
 #general grid binaries
 GRIDPROXYINFO=grid-proxy-info
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index 61df763..13cb89c 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -36,7 +36,7 @@ ulimit -c unlimited
 
 # define variables
 GLITE_LB_LOCATION=${GLITE_LB_LOCATION:-$GLITE_LOCATION}
-GLITE_LOCATION=${GLITE_LOCATION:-'/opt/glite'}
+GLITE_LOCATION=${GLITE_LOCATION:-'/usr'}
 SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
 for dir in $GLITE_LOCATION $GLITE_LOCATION/lib64/glite-lb $GLITE_LOCATION/lib/glite-lb; do
 	if test -d "$dir/examples"; then PATH="$dir/examples:$PATH"; fi
diff --git a/org.glite.testsuites.ctb/PX/tests/px-common.sh b/org.glite.testsuites.ctb/PX/tests/px-common.sh
index 003ef64..aa1d9e8 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-common.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-common.sh
@@ -34,10 +34,10 @@ source ${TEST_COMMON}
 
 
 # define variables
-GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
-PATH=$GLITE_LOCATION/bin:$GLITE_LOCATION/examples:$PATH
-export PATH
+#GLITE_LOCATION=${GLITE_LOCATION:-'/usr'}
+#SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
+#PATH=$GLITE_LOCATION/bin:$GLITE_LOCATION/examples:$PATH
+#export PATH
 
 GRIDPROXYINFO=grid-proxy-info
 
diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common.sh
index 003ef64..aa1d9e8 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common.sh
@@ -34,10 +34,10 @@ source ${TEST_COMMON}
 
 
 # define variables
-GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
-PATH=$GLITE_LOCATION/bin:$GLITE_LOCATION/examples:$PATH
-export PATH
+#GLITE_LOCATION=${GLITE_LOCATION:-'/usr'}
+#SAME_SENSOR_HOME=${SAME_SENSOR_HOME:-.}
+#PATH=$GLITE_LOCATION/bin:$GLITE_LOCATION/examples:$PATH
+#export PATH
 
 GRIDPROXYINFO=grid-proxy-info
 
-- 
1.8.2.3