From e02381554b1085a75ec4582afa2e63ac184870cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 10 Nov 2011 11:41:10 +0000 Subject: [PATCH] Fix function naming ambiguity --- org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh | 6 +++--- org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 -- 1.8.2.3