Update 2drive test

[bacula/bacula] / regress / tests / 2drive-incremental-2disk

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 248308da3a154f6e0a2a1eb748b4853f91927d37..ae7d8cf9009444a75ad237ec73b1f9d6a9541c19 100755 (executable)
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -5,13 +5,9 @@
 #
 # This script uses the virtual disk autochanger and two drives
 #
-. config.out
 TestName="2drive-incremental-2disk"
 JobName="2drive2disk"
 . scripts/functions
-set_debug 0
-
-cwd=`pwd`
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
@@ -43,6 +39,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
+setdebug level=0 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=DDS-4
@@ -100,7 +97,8 @@ stop_bacula
 
 check_two_logs
 # The restore should read from TestVolume002, which was on drive 1
-grep tmp/log2.out TestVolume002
+grep TestVolume002 tmp/log2.out >/dev/null 2>&1
+# Note rstat may already be set, so we don't just store into it
 if [ $? != 0 ] ; then
    rstat=$?
 fi