From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 12 May 2012 11:20:45 +0000 (+0000)
Subject: Update tests for first unofficial releas of proxyrenewal on Debian.
X-Git-Tag: merge_torque_to_head_after~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bb078d872875a7b60b705ca02fe2b670086a863b;p=jra1mw.git

Update tests for first unofficial releas of proxyrenewal 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 fc66735..f6b032d 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
@@ -24,10 +24,7 @@ COPYPROXY=$2
 egrep -i "Debian|Ubuntu" /etc/issue
 if [ $? = 0 ]; then
 	INSTALLCMD="apt-get install -q --yes"
-	# XXX: remove that hack after myproxy is in Debian stable
-	#INSTALLPKGS="lintian"
-	INSTALLPKGS="
-aptitude -t testing -y install lintian"
+	INSTALLPKGS="lintian"
 else
 	INSTALLCMD="yum install -q -y --nogpgcheck"
 	INSTALLPKGS="rpmlint"
@@ -67,7 +64,7 @@ if [ $COPYPROXY -eq 1 ]; then
 else
 	rm -rf /tmp/test-certs/grid-security
 	cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/LB > /dev/null 2>/dev/null
-	FAKE_CAS=\`source ./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh --lsc | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
+	FAKE_CAS=\`./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh --lsc | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
 	if [ "\$FAKE_CAS" = "" ]; then
                 echo "Failed generating proxy" >&2
                 exit 2