X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fincremental-tape;h=4b827d7eb70f9a147f63ab4c81f84e39e0f7fb01;hb=7f2d4342af6f630a86e12a6ca63b2a497fdf5a1e;hp=88b4d86980b13eee0be2941827efa4b44e249980;hpb=83b48c47a346bd3fd2904ec593c6a27277a97009;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 88b4d86980..4b827d7eb7 100755
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -4,12 +4,6 @@
 #   new files, do an Incremental and restore those two files.
 #
 cwd=`pwd`
-bin/bacula stop  2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
@@ -25,16 +19,16 @@ cd ${cwd}
 
 echo " "
 echo " "
-echo " === Starting incremental-tape test ==="
-echo " === Starting incremental-tape test ===" >>working/log
+echo " === Starting incremental-tape test at `date +%R:%S` ==="
+echo " === Starting incremental-tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 wait
 messages
@@ -43,7 +37,7 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -66,9 +60,9 @@ quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 #
 # Delete .c files because we will only restored the txt files