Downloading common definitions.

diff --git a/org.glite.testsuites.ctb/PX/tests/px-test-packaging.sh b/org.glite.testsuites.ctb/PX/tests/px-test-packaging.sh
index 8dd3a06..5501409 100755 (executable)
--- a/org.glite.testsuites.ctb/PX/tests/px-test-packaging.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-test-packaging.sh
@@ -48,13 +48,22 @@ EndHelpHeader
 }
 
 # read common definitions and functions
-COMMON=px-common.sh
-if [ ! -r ${COMMON} ]; then
-       printf "Common definitions '${COMMON}' missing!"
-       exit 2
-fi
-source ${COMMON}
-source lb-common.sh
+for COMMON in PX/px-common.sh LB/lb-common.sh
+do
+       SUBSYS=`dirname $COMMON`
+       FILE=`basename $COMMON`
+        if [ ! -r ${FILE} ]; then
+                printf "Downloading common definitions '${COMMON}'"
+                wget -q -O ${FILE} http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.testsuites.ctb/$SUBSYS/tests/$FILE?view=co > /dev/null
+                if [ ! -r ${FILE} ]; then
+                        exit 2
+                else
+                        chmod +x $FILE
+                        test_done
+                fi
+        fi
+       source $FILE
+done
 
 while test -n "$1"
 do

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-packaging.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-packaging.sh
index 12adeba..3cdb2f4 100755 (executable)
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-packaging.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-packaging.sh
@@ -48,24 +48,21 @@ EndHelpHeader
 }
 
 # read common definitions and functions
-for COMMON in gridsite-common.sh lb-common.sh
+for COMMON in gridsite/gridsite-common.sh LB/lb-common.sh
 do
-       if [ [ "$COMMON" \< "l" ]; then 
-               SUBSYS="gridsite"
-       else 
-               SUBSYS="LB"
-       fi
-        if [ ! -r ${COMMON} ]; then
+       SUBSYS=`dirname $COMMON`
+       FILE=`basename $COMMON`
+        if [ ! -r ${FILE} ]; then
                 printf "Downloading common definitions '${COMMON}'"
-                wget -O ${COMMON} http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.testsuites.ctb/$SUBSYS/tests/$COMMON?view=co > /dev/null
-                if [ ! -r ${COMMON} ]; then
+                wget -q -O ${FILE} http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.testsuites.ctb/$SUBSYS/tests/$FILE?view=co > /dev/null
+                if [ ! -r ${FILE} ]; then
                         exit 2
                 else
-                        chmod +x $COMMON
+                        chmod +x $FILE
                         test_done
                 fi
         fi
-       source $COMMON
+       source $FILE
 done
 
 while test -n "$1"