X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fvirtual-backup-test;h=69f1fb69fd8f14ce05f654f777a361b47043001b;hb=7d5eacc922052324417c82382d6a18e8054245e8;hp=b5c26560ed3875cef9c8fd60fb40166ae8a26107;hpb=bef1c589442d009349f2263cb6a1ad75afcd81b8;p=bacula%2Fbacula

diff --git a/regress/tests/virtual-backup-test b/regress/tests/virtual-backup-test
index b5c26560ed..69f1fb69fd 100755
--- a/regress/tests/virtual-backup-test
+++ b/regress/tests/virtual-backup-test
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Run a simple backup of the Bacula build directory then do a virtual
-#   backup to another device.
+# Run a simple backup of the Bacula build directory then do a 
+#   Virtual Full backup to another device.
 #
-# This script uses the virtual disk autochanger
+# This script uses the disk autochanger
 #
 TestName="virtual-backup-test"
 JobName=Vbackup
@@ -34,6 +34,7 @@ label storage=File volume=FileVolume001 Pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
 @# run several jobs
+@exec "sh -c 'date > ${cwd}/build/date'"
 run job=$JobName level=Full yes
 wait
 messages
@@ -48,6 +49,7 @@ run job=$JobName level=Differential yes
 wait
 messages
 list jobs
+@exec "sh -c 'date > ${cwd}/build/date'"
 @exec "sh -c 'touch ${cwd}/build/src/dird/*.o'"
 run job=$JobName level=Incremental yes
 wait
@@ -57,7 +59,6 @@ list volumes
 @# 
 @# now do a normal restore of normal backups
 @#
-@$out ${cwd}/tmp/log2.out
 setdebug level=10 dir
 restore where=${cwd}/tmp/bacula-restores select
 unmark *
@@ -66,7 +67,8 @@ done
 yes
 list volumes
 @# should Consolidate Full, Differential and Incremental
-@#setdebug level=51 storage=DiskChanger
+setdebug level=150 storage=DiskChanger
+setdebug level=100 dir
 run job=$JobName level=VirtualFull yes
 wait
 messages
@@ -75,7 +77,6 @@ list jobs
 @# 
 @# now do a restore of the consolidated Full
 @#
-@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
@@ -93,6 +94,11 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
+#
+# We only used one log so copy it to the second log
+#  so that any restore errors will be picked up
+#
+cp -f ${cwd}/tmp/log1.out ${cwd}/tmp/log2.out
 check_two_logs
 check_restore_diff
 end_test