From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 14 Dec 2008 13:44:36 +0000 (+0000)
Subject: ebl  update test
X-Git-Tag: Release-7.0.0~3639
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=568cbd6a03dc54976c6cf7c34987cf55b255ac6e;p=bacula%2Fbacula

ebl  update test


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8155 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/tests/bsr-read-test b/regress/tests/bsr-read-test
index 2b8463b932..1207c0ef98 100755
--- a/regress/tests/bsr-read-test
+++ b/regress/tests/bsr-read-test
@@ -115,16 +115,17 @@ check_two_logs
 dstat=0
 
 perl -ne '
-sub check_bloc {   
-  $nb = $last_bloc - $last_bsr_bloc;
+sub check_block {   
+  return unless ($last_block || $last_bsr_block);
+  $nb = $last_block - $last_bsr_block;
   if ($nb > 65000) {
      print "ERROR: read too many bytes $nb\n";
   }
 }
 sub print_stat {
-     print "$last_job\nlast_bsr_bloc=$last_bsr_bloc last_bloc_read=$last_bloc\n";
-     check_bloc();
-     $last_bsr_bloc = $last_bloc=0;
+     print "$last_job\nlast_bsr_block=$last_bsr_block last_block_read=$last_block\n";
+     check_block();
+     $last_bsr_block = $last_block=0;
 }
 
 if (/dircmd.c.+(JobId=\d+ job=\S+) .+client_name=.+-fd/) {
@@ -134,8 +135,8 @@ if (/dircmd.c.+(JobId=\d+ job=\S+) .+client_name=.+-fd/) {
 }
 
 $last_job=$1      if /dircmd.c.+(JobId=\d+ job=\S+)/;
-$last_bsr_bloc=$1 if /fd_cmds.c:.+VolBlock=\d+-(\d+)/;
-$last_bloc=$1     if /read_record.c.+file:block=\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 { 
   print_stat();
 }' working/*-sd.trace > tmp/result