From 64c55d12d65f640cb355924ea0ab7c16cefcfa5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 27 Oct 2011 13:00:05 +0000 Subject: [PATCH] - Lowercase output - silent cvs co - check existence of cvs BEFORE using it --- .../LB/tests/lb-autonomous-test.sh | 2 +- .../LB/tests/lb-common-testbeds.sh | 30 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh index bd3b449..47bba7d 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh @@ -123,7 +123,7 @@ Clean installation according to EMI guidelines (CA certificates, proxy certifica | OS Issue | $ISSUE | | Platform | $PLATFORM | | Host | $TESTBED | -| DURATION | `expr $DURATION / 60` min | +| Duration | `expr $DURATION / 60` min | ---++++ Process \n" > report.twiki 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 9145d11..644f3e9 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh @@ -55,6 +55,20 @@ createuser -U postgres -S -R -D rtm cd /tmp +CVSPATH=\`which cvs\` + +if [ "\$CVSPATH" = "" ]; then + printf "CVS binary not present" + egrep -i "Debian|Ubuntu" /etc/issue + + if [ \$? = 0 ]; then + apt-get install --yes cvs + else + yum install -y cvs + fi + +fi + glite_id=\`id -u \$GLITE_USER\` echo \$GLITE_USER user ID is \$glite_id @@ -64,7 +78,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 + 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=//'\` if [ "\$FAKE_CAS" == "" ]; then echo "Failed generating proxy" >&2 @@ -74,20 +88,6 @@ else fi fi -CVSPATH=\`which cvs\` - -if [ "\$CVSPATH" = "" ]; then - printf "CVS binary not present" - egrep -i "Debian|Ubuntu" /etc/issue - - if [ \$? = 0 ]; then - apt-get install --yes cvs - else - yum install -y cvs - fi - -fi - echo cd > arrange_lb_test_user.sh echo export LBTSTCOLS=\$LBTSTCOLS >> arrange_lb_test_user.sh echo 'export GLITE_MYSQL_ROOT_PASSWORD="[Edited]"' >> arrange_lb_test_user.sh -- 1.8.2.3