X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbackup-bacula-test;h=0815c38316630e96ac76638ddf4c295e2928a681;hb=7ec6a7e8c7b6908e321883b18dbc64e244bc282a;hp=bf329d125a263c48007e4a5ce5e05980a8b72eb3;hpb=5fcf90dff3408e1f14722a222042ba36b952065f;p=bacula%2Fbacula

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index bf329d125a..0815c38316 100755
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -6,19 +6,18 @@
 TestName="backup-bacula-test"
 JobName=backup
 . scripts/functions
-set_debug 0
 
-scripts/copy-confs
 scripts/cleanup
+scripts/copy-confs
 
 change_jobname Client1 $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-label volume=TestVolume001
+@$out ${cwd}/tmp/log1.out
+label volume=TestVolume001 storage=File pool=Default
 @#setdebug level=100 storage=File
 run job=$JobName yes
 status storage=File
@@ -44,7 +43,31 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out  
+@$out ${cwd}/tmp/log2.out  
+restore where=${cwd}/tmp/bacula-restores select all done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+@#setdebug level=100 storage=File
+run job=$JobName yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out  
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -53,8 +76,15 @@ messages
 quit
 END_OF_DATA
 
+#
+# Now do a second backup after making a few changes
+#
+touch ${cwd}/build/src/dird/*.c
+echo "test test" > ${cwd}/build/src/dird/xxx
+#
+
 run_bacula
-check_for_zombie_jobs storate=File
+check_for_zombie_jobs storage=File
 stop_bacula
 
 check_two_logs