Merge branch 'master' into basejobv3

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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 8cf65cf560e0a131a9319987aac548da629da633..a21bca9749d7df17bb3fc93310bbfd0aa6b80ad6 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -19,11 +19,11 @@ echo "s%  Schedule =%# Schedule =%g" >${outf}
 cp $scripts/bacula-dir.conf $tmp/1
 sed -f ${outf} $tmp/1 >$scripts/bacula-dir.conf
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out $tmp/log1.out
 setdebug level=100 storage=File
@@ -57,7 +57,6 @@ restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -66,7 +65,7 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out $tmp/log1.out
 @#setdebug level=100 storage=File
@@ -81,7 +80,6 @@ restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA