From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 11 Sep 2012 20:56:30 +0000 (+0000)
Subject: Update CVSROOT in tests (jra1mw subdir is working but unreliable).
X-Git-Tag: glite-lb-client_R_5_2_7_1~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ac92017eb60d1e3ab5c61a86f5d6bc6b69808507;p=jra1mw.git

Update CVSROOT in tests (jra1mw subdir is working but unreliable).
---

diff --git a/org.glite.testsuites.ctb/CANL-C/tests/canl-common-testbeds.sh b/org.glite.testsuites.ctb/CANL-C/tests/canl-common-testbeds.sh
index 672f335..b42555b 100755
--- a/org.glite.testsuites.ctb/CANL-C/tests/canl-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/CANL-C/tests/canl-common-testbeds.sh
@@ -35,13 +35,14 @@ CERTFILE=\$1
 GLITE_USER=\$2
 GSTSTCOLS=\$3
 OUTPUT_OPT=\$4
+CVSROOT=:pserver:anonymous@glite.cvs.cern.ch:/cvs/glite
 
 echo "Certificate file: \$CERTFILE "
 echo "gLite user:       \$GLITE_USER "
 echo "Terminal width:   \$GSTSTCOLS "
 echo "Output format:    \$OUTPUT_OPT "
 
-export GSTSTCOLS
+export GSTSTCOLS CVSROOT
 
 ${INSTALLCMD} wget lsof cvs voms-clients globus-proxy-utils $INSTALLPKGS
 
@@ -52,7 +53,7 @@ if [ $COPYPROXY -eq 1 ]; then
 	chown \`id -un\`:\`id -gn\` x509up_u\`id -u\`
 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
+	cvs co org.glite.testsuites.ctb/LB > /dev/null 2>/dev/null
 	./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh --all > fake-prox.out.\$\$
 	FAKE_CAS=\`cat fake-prox.out.\$\$ | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
 	if [ "\$FAKE_CAS" = "" ]; then
@@ -71,7 +72,7 @@ fi
 cd ~/
 mkdir caNl_testing
 cd caNl_testing
-cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/CANL-C
+cvs co org.glite.testsuites.ctb/CANL-C
 cd org.glite.testsuites.ctb/CANL-C/tests
 echo ========================
 echo "  REAL TESTS START HERE"
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
index 38d8508..b8573ae 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh
@@ -36,13 +36,14 @@ CERTFILE=\$1
 GLITE_USER=\$2
 LBTSTCOLS=\$3
 OUTPUT_OPT=\$4
+CVSROOT=':pserver:anonymous@glite.cvs.cern.ch:/cvs/glite'
 
 echo "Certificate file: \$CERTFILE "
 echo "gLite user:       \$GLITE_USER "
 echo "Terminal width:   \$LBTSTCOLS "
 echo "Output format:    \$OUTPUT_OPT "
 
-export LBTSTCOLS
+export LBTSTCOLS CVSROOT
 
 ${INSTALLCMD} globus-proxy-utils postgresql voms-clients curl wget sudo bc $INSTALLPKGS
 
@@ -87,7 +88,7 @@ if [ $COPYPROXY -eq 1 ]; then
 	chown \$GLITE_USER:\$GLITE_USER x509up_u\${glite_id}
 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
+	cvs 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=//'\`
 	if [ "\$FAKE_CAS" = "" ]; then
                 echo "Failed generating proxy" >&2
@@ -110,7 +111,7 @@ echo export LBTSTCOLS=\$LBTSTCOLS >> arrange_lb_test_user.sh
 echo 'export GLITE_MYSQL_ROOT_PASSWORD="[Edited]"' >> arrange_lb_test_user.sh
 echo mkdir -p LB_testing >> arrange_lb_test_user.sh
 echo cd LB_testing >> arrange_lb_test_user.sh
-echo cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/LB >> arrange_lb_test_user.sh
+echo cvs -d \$CVSROOT co org.glite.testsuites.ctb/LB >> arrange_lb_test_user.sh
 echo ls >> arrange_lb_test_user.sh
 echo cd org.glite.testsuites.ctb/LB/tests >> arrange_lb_test_user.sh
 echo ulimit -c unlimited >> arrange_lb_test_user.sh
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 c33a0a9..86b14ee 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
@@ -36,13 +36,14 @@ CERTFILE=\$1
 GLITE_USER=\$2
 PXTSTCOLS=\$3
 OUTPUT_OPT=\$4
+CVSROOT=':pserver:anonymous@glite.cvs.cern.ch:/cvs/glite'
 
 echo "Certificate file: \$CERTFILE "
 echo "gLite user:       \$GLITE_USER "
 echo "Terminal width:   \$PXTSTCOLS "
 echo "Output format:    \$OUTPUT_OPT "
 
-export PXTSTCOLS
+export PXTSTCOLS CVSROOT
 
 ${INSTALLCMD} globus-proxy-utils voms-clients curl wget $INSTALLPKGS
 
@@ -64,7 +65,7 @@ if [ $COPYPROXY -eq 1 ]; then
 	chown \$GLITE_USER:\$GLITE_USER x509up_u\${glite_id}
 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
+	cvs co org.glite.testsuites.ctb/LB > /dev/null 2>/dev/null
 	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
@@ -96,7 +97,7 @@ echo export PXTSTCOLS=\$PXTSTCOLS >> arrange_px_test_user.sh
 echo 'export GLITE_MYSQL_ROOT_PASSWORD="[Edited]"' >> arrange_px_test_user.sh
 echo mkdir PX_testing >> arrange_px_test_user.sh
 echo cd PX_testing >> arrange_px_test_user.sh
-echo cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/PX >> arrange_px_test_user.sh
+echo cvs -d \$CVSROOT co org.glite.testsuites.ctb/PX >> arrange_px_test_user.sh
 echo ls >> arrange_px_test_user.sh
 echo cd org.glite.testsuites.ctb/PX/tests >> arrange_px_test_user.sh
 echo ulimit -c unlimited >> arrange_px_test_user.sh
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 4019089..44af515 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -37,13 +37,14 @@ CERTFILE=\$1
 GLITE_USER=\$2
 GSTSTCOLS=\$3
 OUTPUT_OPT=\$4
+CVSROOT=':pserver:anonymous@glite.cvs.cern.ch:/cvs/glite'
 
 echo "Certificate file: \$CERTFILE "
 echo "gLite user:       \$GLITE_USER "
 echo "Terminal width:   \$GSTSTCOLS "
 echo "Output format:    \$OUTPUT_OPT "
 
-export GSTSTCOLS
+export GSTSTCOLS CVSROOT
 
 ${INSTALLCMD} voms-clients curl wget lsof $INSTALLPKGS
 
@@ -121,7 +122,7 @@ if [ $COPYPROXY -eq 1 ]; then
 	chown \`id -un\`:\`id -gn\` x509up_u\`id -u\`
 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
+	cvs co org.glite.testsuites.ctb/LB > /dev/null 2>/dev/null
 	./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh > fake-prox.out.\$\$
 	FAKE_CAS=\`cat fake-prox.out.\$\$ | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
 	if [ "\$FAKE_CAS" = "" ]; then
@@ -149,7 +150,7 @@ fi
 cd ~/
 mkdir GridSite_testing
 cd GridSite_testing
-cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/gridsite
+cvs co org.glite.testsuites.ctb/gridsite
 cd org.glite.testsuites.ctb/gridsite/tests
 echo ========================
 echo "  REAL TESTS START HERE"