update

[bacula/bacula] / regress / tests / virtual-backup-test

diff --git a/regress/tests/virtual-backup-test b/regress/tests/virtual-backup-test
index b5c26560ed3875cef9c8fd60fb40166ae8a26107..d613fe24746c372dacf7700d71c3ea59ee3772bc 100755 (executable)
--- a/regress/tests/virtual-backup-test
+++ b/regress/tests/virtual-backup-test
@@ -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