From a06aad0c769a3ef30e572706fe1614d0dbdcf134 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 13 Apr 2012 12:41:52 +0000 Subject: [PATCH] Compatibility with curl linked with gnutls (to work on SL6 and Debian 6). --- org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh index f66bfe9..dae8f3e 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh @@ -389,7 +389,7 @@ EOF mkdir -p /tmp/vomsdir.$$ mv -f /etc/grid-security/vomsdir/* /tmp/vomsdir.$$/ printf "Trying with empty vomsdir. GRST_CRED_2 should not be present... " - GRST_CRED_2=`curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi|grep GRST_CRED_2` + GRST_CRED_2=`curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --cacert /tmp/x509up_u0 --silent https://$(hostname -f)/test.cgi|grep GRST_CRED_2` if [ "$GRST_CRED_2" = "" ]; then test_done else @@ -434,7 +434,8 @@ EOF fi done - GRST_CRED_2=`curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi|grep GRST_CRED_2` +exit 0 + GRST_CRED_2=`curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --cacert /tmp/x509up_u0 --silent https://$(hostname -f)/test.cgi|grep GRST_CRED_2` if [ "$GRST_CRED_2" = "" ]; then print_error "GRST_CRED_2 not returned" @@ -464,7 +465,7 @@ EOF test_done printf "Getting list of Role attributes from test.cgi... " - curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi|grep -E "^GRST_CRED_AURI_.*Role=" | sed -r 's/^GRST_CRED_AURI_[0-9]+=fqan://' > test-roles-pre.$$.out + curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --cacert /tmp/x509up_u0 --silent https://$(hostname -f)/test.cgi|grep -E "^GRST_CRED_AURI_.*Role=" | sed -r 's/^GRST_CRED_AURI_[0-9]+=fqan://' > test-roles-pre.$$.out if [ ! -s info-roles.$$.out ]; then printf "EMPTY!" @@ -476,7 +477,7 @@ EOF voms-proxy-init -noregen > /dev/null 2> /dev/null test_done printf "Getting another set of Role attributes from test.cgi... " - curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi|grep -E "^GRST_CRED_AURI_.*Role=" | sed -r 's/^GRST_CRED_AURI_[0-9]+=fqan://' > test-roles-post.$$.out + curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --cacert /tmp/x509up_u0 --silent https://$(hostname -f)/test.cgi|grep -E "^GRST_CRED_AURI_.*Role=" | sed -r 's/^GRST_CRED_AURI_[0-9]+=fqan://' > test-roles-post.$$.out if [ ! -s test-roles-post.$$.out ]; then test_failed print_error "List of role attributes is empty!" -- 1.8.2.3