update

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

diff --git a/regress/tests/copy-volume-test b/regress/tests/copy-volume-test
index f018d8e5c4d9b66182459086994036d6381c7e0f..d11bb18af98b04bf965d0b3ef8968d776ca90765 100755 (executable)
--- a/regress/tests/copy-volume-test
+++ b/regress/tests/copy-volume-test
@@ -166,40 +166,27 @@ check_restore_diff
 
 stop_bacula
 
-################################################################
-# Get information from logs
-get_info()
-{
-    IDX=$1
-    LOG=$2
-    RET=`awk -v idx=$IDX -F: '/Prev Backup JobId/ { pbid[j++]=$2 } /New Backup JobId/  { nbid[i++]=$2 } END { print pbid[idx] " " nbid[idx] }' $LOG`
-}
-
-get_info 0 ${cwd}/tmp/log11.out
-set $RET
-
-if [ -z "$2" -o "$2" = 0 ]; then
+get_mig_info 1 ${cwd}/tmp/log11.out
+
+if [ -z "$RET" -o "$RET" -eq 0 ]; then
     bstat=2
     print_debug "The first job must have been copied"
 fi
 
-get_info 1 ${cwd}/tmp/log11.out
-set $RET
+get_mig_info 2 ${cwd}/tmp/log11.out
 
-if [ -z "$2" -o "$2" != 0 ]; then
+if [ -z "$RET" -o "$RET" -ne 0 ]; then
     bstat=2
     print_debug "The second job have no files, it can't have been copied"
 fi
 
-get_info 0 ${cwd}/tmp/log4.out
-set $RET
+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 "$2" -o "$2" = 0 ]; then
+if [ -z "$RET" -o "$RET" -eq 0 ]; then
     bstat=2
     print_debug "The new incremental job must have been copied"
 fi
 
-
-
 check_two_logs
 end_test