From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Thu, 10 Nov 2011 11:41:10 +0000 (+0000)
Subject: Fix function naming ambiguity
X-Git-Tag: merge_30_head_take2_dst~52
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e02381554b1085a75ec4582afa2e63ac184870cf;p=jra1mw.git

Fix function naming ambiguity
---

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 403f23c..5882f0d 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
@@ -57,8 +57,8 @@ source gridsite-common-testbeds.sh
 #also read L&B common definitions for common functions.
 if [ ! -r lb-common-testbeds.sh ]; then
 	printf "Downloading common definitions 'lb-common-testbeds.sh'"
-        wget -O ${COMMON} 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 ${COMMON} ]; then
+        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
                 exit 2
         else
                 test_done
@@ -85,7 +85,7 @@ test_done
 
 
 printf "Generating the 'arrange' script... "
-gen_arrange_script `hostname -f` 0
+gen_arrange_script_gridsite `hostname -f` 0
 test_done
 
 
diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
index ffb360f..9ccc530 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-function gen_arrange_script()
+function gen_arrange_script_gridsite()
 {
 remotehost=$1
 COPYPROXY=$2