- Remember fake cert paths

- Regenerate voms extensions if fake

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
index 33c137e..9e232ed 100755 (executable)
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -79,7 +79,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=\`./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
+       FAKE_CAS=\`source ./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
        if [ "\$FAKE_CAS" == "" ]; then
                 echo "Failed generating proxy" >&2
                 exit 2

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 6cb9414..5d17b08 100755 (executable)
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
@@ -391,6 +391,12 @@ EOF
 
                printf "Setting up .lsc file and trying again\n"
 
+               UTOPIA=`voms-proxy-info -all | grep -A 100 "extension information" | grep "^issuer" | grep utopia`
+               if [ $UTOPIA != "" ]; then
+                       printf "Possibly fake VOMS extensions. Regenerating..."
+                       voms-proxy-init -voms vo.org -key $x509_USER_KEY -cert $x509_USER_CERT | grep -A 100 "extension information" 
+               fi;
+
                for vomsfile in /etc/vomses/*
                do
                        if [ -f $vomsfile ]; then