From 16e2e3b9d4b47267e5fcbf632f52ade5b8ae6692 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 29 Sep 2007 08:27:27 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5688 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/functions | 7 +++---- regress/tests/six-vol-test | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/regress/scripts/functions b/regress/scripts/functions index aedc62a1b5..0028283472 100644 --- a/regress/scripts/functions +++ b/regress/scripts/functions @@ -145,15 +145,14 @@ end_test() if [ $bstat != 0 -o $rstat != 0 ] ; then echo " !!!!! Bad termination status !!!!! " echo " !!!!! Bad termination status !!!!! " >>test.out - echo " Status: backup=$bstat restore=$rstat diff=$dstat" - echo " Status: backup=$bstat restore=$rstat diff=$dstat" >>test.out else echo " !!!!! Restored files differ !!!!! " echo " !!!!! Restored files differ !!!!! " >>test.out - echo " Status: backup=$bstat restore=$rstat diff=$dstat" - echo " Status: backup=$bstat restore=$rstat diff=$dstat" >>test.out fi + echo " Status: backup=$bstat restore=$rstat diff=$dstat" + echo " Status: backup=$bstat restore=$rstat diff=$dstat" >>test.out echo " " + exit 1 else echo " ===== $TestName OK `date +%R:%S` ===== " echo " ===== $TestName OK `date +%R:%S` ===== " >>test.out diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index 36591d72a9..a925ff94e5 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -30,6 +30,7 @@ cat <tmp/bconcmds @output /dev/null messages @$out tmp/log1.out +@#setdebug level=50 storage=File run job=$JobName storage=File yes run job=$JobName storage=File yes run job=$JobName storage=File yes @@ -42,6 +43,11 @@ messages @# now do a restore @# @$out tmp/log2.out +sql +select * from JobMedia where JobId=4; +select * from JobMedia where JobId=5; + +@#setdebug level=50 storage=File restore where=${cwd}/tmp/bacula-restores select storage=File unmark * mark * -- 2.39.5