Reorganize regex code

[bacula/bacula] / regress / tests / copy-volume-test

diff --git a/regress/tests/copy-volume-test b/regress/tests/copy-volume-test
index d272c97cd4c7b8664fa7e753b16b63312e53667d..2783299f38c063a9fea2f54a028cdded6cd446b9 100755 (executable)
--- a/regress/tests/copy-volume-test
+++ b/regress/tests/copy-volume-test
@@ -32,7 +32,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 label storage=File volume=FileVolume001 Pool=Default
@@ -93,7 +93,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -168,14 +167,14 @@ stop_bacula
 
 get_mig_info 1 ${cwd}/tmp/log11.out
 
-if [ -z "$RET" -o $RET -eq 0 ]; then
+if [ -z "$RET" -o "$RET" = 0 ]; then
     bstat=2
     print_debug "The first job must have been copied"
 fi
 
 get_mig_info 2 ${cwd}/tmp/log11.out
 
-if [ -z "$RET" -o $RET -ne 0 ]; then
+if [ -n "$RET" ]; then
     bstat=2
     print_debug "The second job has no files, it can't have been copied"
 fi
@@ -183,7 +182,7 @@ fi
 JOBID=`awk -F= '/Job queued. JobId/ {if(!f){print $2; f=1;}}' ${cwd}/tmp/log4.out`
 get_mig_info $JOBID ${cwd}/tmp/log4.out
 
-if [ -z "$RET" -o $RET -eq 0 ]; then
+if [ -z "$RET" -o "$RET" = 0 ]; then
     bstat=2
     print_debug "The new incremental job must have been copied"
 fi