[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bacula-devel] Regression Tests Patch: tests/accurate-test


Hi,

Just run the regression tests on Solaris, and tests/accurate-test
generated a few error messages. The script has some ksh/bash-isms,
which do not work with the Bourne shell, e.g.

 $(command)
instead of
 `command`

and
 if ! command; then
instead of
 command
 if [ $? != 0 ]; then

The attached patch fixes these (and I based the fixes on other
scripts in the tests directory).

Allan
Index: tests/accurate-test
===================================================================
--- tests/accurate-test	(revision 6496)
+++ tests/accurate-test	(working copy)
@@ -88,8 +88,8 @@
 ################################################################
 
 ${cwd}/bin/bls -c ${cwd}/bin/bacula-sd.conf -V 'TestVolume001' FileStorage > tmp/bls.out
-if ! grep -- '----' tmp/bls.out | grep xxx > /dev/null
-then
+grep -- '----' tmp/bls.out | grep xxx > /dev/null
+if [ $? != 0 ] ; then
     bstat=2
 fi
 
@@ -272,8 +272,8 @@
 
 rm -rf ${cwd}/tmp/bacula-restores
 
-if ! grep 'st_mode  differ' tmp/log1.out > /dev/null
-then
+grep 'st_mode  differ' tmp/log1.out > /dev/null
+if [ $? != 0 ] ; then
     bstat=2
 fi
 
@@ -300,7 +300,7 @@
 run_bconsole
 check_for_zombie_jobs storage=File
 
-jobid=$(awk '/ Incr.+backup/ { jobid=$1 } END { print jobid }' ${cwd}/tmp/log3.out)
+jobid=`awk '/ Incr.+backup/ { jobid=$1 } END { print jobid }' ${cwd}/tmp/log3.out`
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log3.out
@@ -310,8 +310,8 @@
 
 run_bconsole
 
-if ! grep yyy ${cwd}/tmp/log3.out > /dev/null
-then
+grep yyy ${cwd}/tmp/log3.out > /dev/null
+if [ $? != 0 ] ; then
     bstat=2
 fi
 
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bacula-devel mailing list
Bacula-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/bacula-devel


This mailing list archive is a service of Copilotco.