From: Eric Bollengier Date: Thu, 18 Dec 2008 10:13:38 +0000 (+0000) Subject: ebl tweak test to accept VolAddr X-Git-Tag: Release-3.0.0~460 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e4acf2a67abd48398fd8fda69d5ae769d3ed93fd;p=bacula%2Fbacula ebl tweak test to accept VolAddr git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8183 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/tests/bsr-read-test b/regress/tests/bsr-read-test index 1207c0ef98..5d0003d11a 100755 --- a/regress/tests/bsr-read-test +++ b/regress/tests/bsr-read-test @@ -115,7 +115,7 @@ check_two_logs dstat=0 perl -ne ' -sub check_block { +sub check_block { return unless ($last_block || $last_bsr_block); $nb = $last_block - $last_bsr_block; if ($nb > 65000) { @@ -123,6 +123,9 @@ sub check_block { } } sub print_stat { + if ($last_bsr_addr) { + $last_bsr_block = $last_bsr_addr & 0xFFFFFFFF; + } print "$last_job\nlast_bsr_block=$last_bsr_block last_block_read=$last_block\n"; check_block(); $last_bsr_block = $last_block=0; @@ -135,6 +138,7 @@ if (/dircmd.c.+(JobId=\d+ job=\S+) .+client_name=.+-fd/) { } $last_job=$1 if /dircmd.c.+(JobId=\d+ job=\S+)/; +$last_bsr_addr=$1 if /fd_cmds.c:.+VolAddr=\d+-(\d+)/; $last_bsr_block=$1 if /fd_cmds.c:.+VolBlock=\d+-(\d+)/; $last_block=$1 if /read_record.c.+file:block=\d+:(\d+)/; END {