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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 2c6d8e24cd..0815c38316 100755
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -6,21 +6,20 @@
 TestName="backup-bacula-test"
 JobName=backup
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-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=Client1 yes
+run job=$JobName yes
 status storage=File
 status storage=File
 status storage=File
@@ -44,7 +43,7 @@ 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
@@ -54,7 +53,38 @@ quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storate=File
+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
+messages
+@$out
+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 storage=File
 stop_bacula
 
 check_two_logs