From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 20 Apr 2012 15:12:30 +0000 (+0000)
Subject: Fix test preparation on Debian.
X-Git-Tag: glite-px-proxyrenewal_R_1_3_25_5~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d55e31d0fa0be4181acc11517c97c469011bdc19;p=jra1mw.git

Fix test preparation on Debian.
---

diff --git a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
index 9a66053..0b4809f 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
@@ -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
 
diff --git a/org.glite.testsuites.ctb/PX/tests/px-voms-install.sh b/org.glite.testsuites.ctb/PX/tests/px-voms-install.sh
index c96c270..af06cab 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-voms-install.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-voms-install.sh
@@ -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