From 2f64a1e514f9866b8fa38656b87b5b263235fe42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 18 Nov 2011 02:17:47 +0000 Subject: [PATCH] Portability (on SL6 'sh' drops bourne shell features). --- .../LB/tests/lb-common-testbeds.sh | 42 +++++++++++----------- .../PX/tests/px-common-testbeds.sh | 2 +- .../gridsite/tests/gridsite-common-testbeds.sh | 6 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) 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 1717ed9..5640651 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh @@ -135,27 +135,27 @@ echo echo " REAL TESTS START HERE" >> arrange_lb_test_user.sh echo echo ======================== >> arrange_lb_test_user.sh echo 'echo ""' >> arrange_lb_test_user.sh echo 'echo ""' >> arrange_lb_test_user.sh -echo sh ./lb-test-permissions.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-event-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-il-recovery.sh -f /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-job-registration.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-https.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-job-states.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-logevent.sh /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-recovery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-msg.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-switch.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-stream.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-proxy-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-ws.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-bdii.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-sandbox-transfer.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-changeacl.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-statistics.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-threaded.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-harvester.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-nagios-probe.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-permissions.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-event-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-il-recovery.sh -f /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-job-registration.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-https.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-job-states.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-logevent.sh /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-notif-recovery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-notif-msg.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-notif.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-notif-switch.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-notif-stream.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-proxy-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-ws.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-bdii.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-sandbox-transfer.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-changeacl.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-statistics.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-threaded.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-harvester.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh +echo ./lb-test-nagios-probe.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh echo perl ./lb-test-purge.pl --i-want-to-purge $remotehost:9000 \$OUTPUT_OPT >> arrange_lb_test_user.sh echo 'echo ""' >> arrange_lb_test_user.sh echo 'echo ""' >> 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 63ba8eb..da290df 100755 --- a/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh +++ b/org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh @@ -152,7 +152,7 @@ echo echo " REAL TESTS START HERE" >> arrange_px_test_user.sh echo echo ======================== >> arrange_px_test_user.sh echo 'echo ""' >> arrange_px_test_user.sh echo 'echo ""' >> arrange_px_test_user.sh -echo sh ./px-test-all.sh \$OUTPUT_OPT >> arrange_px_test_user.sh +echo ./px-test-all.sh \$OUTPUT_OPT >> arrange_px_test_user.sh echo 'echo ""' >> arrange_px_test_user.sh echo 'echo ""' >> arrange_px_test_user.sh echo echo ================== >> 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 35ba7d3..6eb7f2a 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh @@ -85,9 +85,9 @@ echo " REAL TESTS START HERE" echo ======================== echo "" echo "" -sh ./ping-remote.sh $remotehost \$OUTPUT_OPT -sh ./ping-local.sh \$OUTPUT_OPT -f /tmp/httpd-webserver.conf -sh ./gridsite-test-all.sh \$OUTPUT_OPT +./ping-remote.sh $remotehost \$OUTPUT_OPT +./ping-local.sh \$OUTPUT_OPT -f /tmp/httpd-webserver.conf +./gridsite-test-all.sh \$OUTPUT_OPT echo "" echo "" echo ================== -- 1.8.2.3