Fix test preparation on Debian.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Fri, 20 Apr 2012 15:12:30 +0000 (15:12 +0000)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Fri, 20 Apr 2012 15:12:30 +0000 (15:12 +0000)
org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
org.glite.testsuites.ctb/PX/tests/px-voms-install.sh

index 9a66053..0b4809f 100755 (executable)
@@ -43,7 +43,7 @@ echo "Output format:    \$OUTPUT_OPT "
 
 export PXTSTCOLS
 
-${INSTALLCMD} globus-proxy-utils voms-clients curl wget xml-commons-apis $INSTALLPKGS
+${INSTALLCMD} globus-proxy-utils voms-clients curl wget $INSTALLPKGS
 
 cd /tmp
 
index c96c270..af06cab 100755 (executable)
@@ -35,14 +35,14 @@ done
 
 egrep -i "Debian|Ubuntu" /etc/issue
 if [ $? = 0 ]; then
-        INSTALLCMD="apt-get install -q --yes"
-       INSTALLPKGS="lintian"
+       INSTALLCMD="apt-get install -q --yes"
+       INSTALLPKGS=""
 else
-        INSTALLCMD="yum install -q -y --nogpgcheck"
-       INSTALLPKGS="rpmlint"
+       INSTALLCMD="yum install -q -y --nogpgcheck"
+       INSTALLPKGS="xml-commons-apis"
 fi
 
-${INSTALLCMD} emi-voms-mysql xml-commons-apis wget
+${INSTALLCMD} emi-voms-mysql wget ${INSTALLPKGS}
 
 #get CAS
 if [ ! -f lb-generate-fake-proxy.sh ]; then