From: Marcel Poul Date: Sun, 26 Feb 2012 21:22:04 +0000 (+0000) Subject: use method args instead of global variables X-Git-Tag: gridsite-core_R_1_7_17~11 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8b8ebf05d00f7c2f80f62b02da04c32f11c7dccb;p=jra1mw.git use method args instead of global variables --- 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 6ba2557..fdaead2 100755 --- a/org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh +++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-common.sh @@ -103,8 +103,8 @@ GEN_PROXY=./canl-generate-fake-proxy.sh function get_canl_binaries() { printf "Testing if binaries of canl examples are available" -if [ -n "$srvbin" -a -n "$clibin" ]; then - check_binaries $srvbin $clibin +if [ -n "$1" -a -n "$2" ]; then + check_binaries $1 $2 if [ $? -gt 0 ]; then test_failed printf "Downloading canl source files and building examples" @@ -116,8 +116,8 @@ if [ -n "$srvbin" -a -n "$clibin" ]; then EMI_CANL_SERVER='./emi-canl-server' EMI_CANL_CLIENT='./emi-canl-client' fi - EMI_CANL_SERVER="$srvbin" - EMI_CANL_CLIENT="$clibin" + EMI_CANL_SERVER="$1" + EMI_CANL_CLIENT="$2" else #default path check_binaries $EMI_CANL_SERVER $EMI_CANL_CLIENT