From 04f5e9b8e6134a58f6d4173c737dec775ca19de6 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 1 Sep 2009 22:30:15 +0200 Subject: [PATCH] Many debug code fixes in regression scripts --- bacula/technotes | 1 + regress/.gitignore | 1 + regress/tests/2drive-2disk | 4 ++-- regress/tests/2drive-2job-test | 3 +-- regress/tests/2drive-3pool-test | 3 +-- regress/tests/2drive-concurrent-test | 2 +- regress/tests/2drive-incremental-2disk | 3 +-- regress/tests/2drive-incremental-changer | 3 +-- regress/tests/2drive-offline-test | 3 +-- regress/tests/2drive-swap-test | 3 +-- regress/tests/accurate-test | 8 +------- regress/tests/acl-xattr-test | 3 +-- regress/tests/ansi-label-tape | 3 +-- regress/tests/auto-label-test | 3 +-- regress/tests/backup-bacula-tape | 3 +-- regress/tests/backup-bacula-test | 6 ++---- regress/tests/backup-to-null | 2 +- regress/tests/backup-win32-tape | 2 +- regress/tests/bad-label-changer | 1 - regress/tests/bextract-test | 3 +-- regress/tests/big-files-test | 3 +-- regress/tests/big-fileset-test | 3 +-- regress/tests/big-virtual-changer-test | 3 +-- regress/tests/big-vol-test | 7 +++---- regress/tests/broken-media-bug-2-test | 2 +- regress/tests/bscan-fast-tape | 3 +-- regress/tests/bscan-tape | 3 +-- regress/tests/bscan-test | 1 - regress/tests/bsr-opt-test | 1 - regress/tests/bsr-read-test | 1 - regress/tests/bug-1227 | 2 +- regress/tests/bvfs-test | 17 ++++++++--------- regress/tests/cancel-test | 2 +- regress/tests/compress-encrypt-test | 1 - regress/tests/compressed-test | 3 +-- regress/tests/concurrent-jobs-test | 2 +- regress/tests/copy-job-test | 3 +-- regress/tests/copy-jobspan-test | 3 +-- regress/tests/copy-time-test | 3 +-- regress/tests/copy-uncopied-test | 2 +- regress/tests/copy-upgrade-test | 3 +-- regress/tests/copy-volume-test | 3 +-- regress/tests/data-encrypt-test | 1 - regress/tests/debug-test | 2 +- regress/tests/dev-test-root | 7 +++---- regress/tests/differential-test | 2 -- regress/tests/eighty-simultaneous-jobs-tape | 3 +-- regress/tests/encrypt-bug-test | 1 - regress/tests/eot-fail-tape | 11 +++++------ regress/tests/errors-test | 8 ++++---- regress/tests/estimate-test | 11 +++++------ regress/tests/etc-test-root | 7 +++---- regress/tests/fast-two-pool-test | 3 +-- regress/tests/fifo-test | 1 - regress/tests/fileregexp-test | 3 +-- regress/tests/fixed-block-size-tape | 1 - regress/tests/four-concurrent-jobs-tape | 3 +-- regress/tests/four-concurrent-jobs-test | 3 +-- regress/tests/four-jobs-tape | 1 - regress/tests/four-jobs-test | 15 +++++++-------- regress/tests/gigaslam-sparse-test | 3 +-- regress/tests/hardlink-test | 1 - regress/tests/incremental-2disk | 1 - regress/tests/incremental-2media | 1 - regress/tests/incremental-2media-tape | 1 - regress/tests/incremental-changer | 1 - regress/tests/incremental-tape | 5 ++--- regress/tests/incremental-test | 17 ++++++++--------- regress/tests/lib-tape-root | 7 +++---- regress/tests/lib-test-root | 7 +++---- regress/tests/manual-two-vol-tape | 1 - regress/tests/maxvol-test | 3 +-- regress/tests/maxvol2-test | 3 +-- regress/tests/memory-bug-tape | 3 +-- regress/tests/migration-job-test | 3 +-- regress/tests/migration-jobspan-test | 3 +-- regress/tests/migration-occupancy-test | 3 +-- regress/tests/migration-time-test | 3 +-- regress/tests/migration-volume-test | 3 +-- regress/tests/multi-client-test | 3 +-- regress/tests/multi-storage-test | 1 - regress/tests/plugin-test | 4 +--- regress/tests/query-test | 8 +++----- regress/tests/recycle-test | 3 +-- regress/tests/relabel-tape | 4 +--- regress/tests/restore-by-file-tape | 6 ++---- regress/tests/restore-by-file-test | 3 +-- regress/tests/restore-disk-seek-test | 1 - regress/tests/restore-seek-tape | 1 - regress/tests/restore2-by-file-test | 3 +-- regress/tests/scratch-pool-test | 1 - regress/tests/scratchpool-pool-test | 1 - regress/tests/six-vol-test | 3 +-- regress/tests/small-file-size-tape | 3 +-- regress/tests/source-addr-test | 5 ++--- regress/tests/span-vol-test | 3 +-- regress/tests/sparse-compressed-test | 3 +-- regress/tests/sparse-encrypt-test | 1 - regress/tests/sparse-test | 3 +-- regress/tests/stats-test | 2 +- regress/tests/strip-test | 1 - regress/tests/three-pool-recycle-test | 3 +-- regress/tests/three-pool-test | 3 +-- regress/tests/tls-authenticate-test | 3 +-- regress/tests/tls-test | 2 -- regress/tests/truncate-bug-tape | 7 +++---- regress/tests/two-jobs-test | 9 ++++----- regress/tests/two-pool-changer | 3 +-- regress/tests/two-pool-test | 3 +-- regress/tests/two-vol-test | 1 - regress/tests/two-volume-changer | 1 - regress/tests/two-volume-test | 1 - regress/tests/usr-tape-root | 6 +++--- regress/tests/verify-cat-test | 1 - regress/tests/verify-vol-tape | 1 - regress/tests/verify-vol-test | 1 - regress/tests/verify-voltocat-test | 1 - regress/tests/virtual-backup-test | 3 +-- regress/tests/virtual-backup2-test | 3 +-- regress/tests/virtual-changer-test | 3 +-- regress/tests/vol-duration-changer | 3 +-- regress/tests/vtape-test-changer | 3 +-- regress/tests/weird-files-test | 1 - regress/tests/weird-files2-test | 3 +-- regress/tests/win32-backup-tape | 2 +- regress/tests/win32-to-linux-tape | 2 +- 126 files changed, 148 insertions(+), 267 deletions(-) diff --git a/bacula/technotes b/bacula/technotes index 58a64f8a78..718907cb19 100644 --- a/bacula/technotes +++ b/bacula/technotes @@ -3,6 +3,7 @@ General: 01Sep09 +kes Many debug code fixes in regression scripts kes Update tape tests for hardware certification Add script for doing btape test command Make btape return error status if test command fails diff --git a/regress/.gitignore b/regress/.gitignore index 81418ad02e..ae606e1895 100644 --- a/regress/.gitignore +++ b/regress/.gitignore @@ -1,3 +1,4 @@ +diff time.out 1 */1 diff --git a/regress/tests/2drive-2disk b/regress/tests/2drive-2disk index 67450591db..f4917915d9 100755 --- a/regress/tests/2drive-2disk +++ b/regress/tests/2drive-2disk @@ -30,7 +30,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=3 dir @@ -82,7 +82,7 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out +@output quit END_OF_DATA diff --git a/regress/tests/2drive-2job-test b/regress/tests/2drive-2job-test index fd3b19a004..d7f8880d86 100755 --- a/regress/tests/2drive-2job-test +++ b/regress/tests/2drive-2job-test @@ -29,7 +29,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=2 Pool=Default drive=0 @@ -69,7 +69,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/2drive-3pool-test b/regress/tests/2drive-3pool-test index 6a7d91bbd9..878c248760 100755 --- a/regress/tests/2drive-3pool-test +++ b/regress/tests/2drive-3pool-test @@ -30,7 +30,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=51 storage=DDS-4 @@ -69,7 +69,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test index 038b9ad396..5f9015e005 100755 --- a/regress/tests/2drive-concurrent-test +++ b/regress/tests/2drive-concurrent-test @@ -20,7 +20,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label pool=Default storage=DDS-4 volume=TestVolume001 slot=1 drive=0 diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk index 43863d8b78..2e3bcbe21c 100755 --- a/regress/tests/2drive-incremental-2disk +++ b/regress/tests/2drive-incremental-2disk @@ -37,7 +37,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=3 dir @@ -95,7 +95,6 @@ restore where=${cwd}/tmp/bacula-restores yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/2drive-incremental-changer b/regress/tests/2drive-incremental-changer index d94a7af8f4..f78c6c3b6c 100755 --- a/regress/tests/2drive-incremental-changer +++ b/regress/tests/2drive-incremental-changer @@ -40,7 +40,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 Pool=Default drive=$DRIVE1 @@ -90,7 +90,6 @@ restore where=${cwd}/tmp/bacula-restores yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/2drive-offline-test b/regress/tests/2drive-offline-test index 93c63918b8..0febc57ae5 100755 --- a/regress/tests/2drive-offline-test +++ b/regress/tests/2drive-offline-test @@ -32,7 +32,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=2 Pool=Default drive=0 @@ -67,7 +67,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/2drive-swap-test b/regress/tests/2drive-swap-test index d96f6e8b16..cd2bb97615 100755 --- a/regress/tests/2drive-swap-test +++ b/regress/tests/2drive-swap-test @@ -29,7 +29,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 @@ -64,7 +64,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test index 63f3d8a1ef..001d1106d5 100755 --- a/regress/tests/accurate-test +++ b/regress/tests/accurate-test @@ -50,7 +50,7 @@ echo ${cwd}/build > ${cwd}/tmp/file-list start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages label volume=TestVolume001 storage=File pool=Default messages @@ -72,7 +72,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA @@ -203,7 +202,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA @@ -236,7 +234,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA @@ -304,7 +301,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA @@ -337,7 +333,6 @@ restore fileset=FS_TESTJOB_ADVANCE where=${cwd}/tmp/bacula-restores select all d yes wait messages -@$out quit END_OF_DATA @@ -370,7 +365,6 @@ restore fileset=FS_TESTJOB_ADVANCE where=${cwd}/tmp/bacula-restores select all d yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test index c0c6f46aa0..6e1c89f122 100755 --- a/regress/tests/acl-xattr-test +++ b/regress/tests/acl-xattr-test @@ -68,7 +68,7 @@ change_jobname BackupClient1 $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label volume=TestVolume001 storage=File pool=Default @@ -86,7 +86,6 @@ restore where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape index d8d3b48f05..d8ce5ecf78 100755 --- a/regress/tests/ansi-label-tape +++ b/regress/tests/ansi-label-tape @@ -25,7 +25,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=200 storage=DDS-4 @@ -81,7 +81,6 @@ yes wait list volumes messages -@$out quit END_OF_DATA diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test index b77ee6423c..681c39df49 100755 --- a/regress/tests/auto-label-test +++ b/regress/tests/auto-label-test @@ -18,7 +18,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out status all @@ -58,7 +58,6 @@ done yes wait messages -@$out quit END_OF_SCRIPT diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 2e0fb1cbc7..eb4a664f64 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -23,7 +23,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=DDS-4 @@ -105,7 +105,6 @@ yes wait list volumes messages -@$out quit END_OF_DATA diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index 25d2e76d49..a21bca9749 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -23,7 +23,7 @@ change_jobname BackupClient1 $JobName start_test cat <$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 <$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 diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null index a8b2af2f39..7540d2fbbe 100755 --- a/regress/tests/backup-to-null +++ b/regress/tests/backup-to-null @@ -22,7 +22,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=Dummy diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape index 36c556caa8..7b9648403a 100755 --- a/regress/tests/backup-win32-tape +++ b/regress/tests/backup-win32-tape @@ -20,7 +20,7 @@ start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default diff --git a/regress/tests/bad-label-changer b/regress/tests/bad-label-changer index 11020b614c..c27b17e28c 100755 --- a/regress/tests/bad-label-changer +++ b/regress/tests/bad-label-changer @@ -64,7 +64,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 3aa8a194ae..fa603e99df 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -16,7 +16,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 pool=Default @@ -35,7 +35,6 @@ restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores se no wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/big-files-test b/regress/tests/big-files-test index 338b21f52c..04c543bb40 100755 --- a/regress/tests/big-files-test +++ b/regress/tests/big-files-test @@ -29,7 +29,7 @@ change_jobname MonsterFileSet $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out status all @@ -67,7 +67,6 @@ done yes wait messages -@$out quit END_OF_SCRIPT diff --git a/regress/tests/big-fileset-test b/regress/tests/big-fileset-test index f5b6d9f071..b0028eeabc 100755 --- a/regress/tests/big-fileset-test +++ b/regress/tests/big-fileset-test @@ -18,7 +18,7 @@ change_jobname MonsterFileSet $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out status all @@ -58,7 +58,6 @@ done yes wait messages -@$out quit END_OF_SCRIPT diff --git a/regress/tests/big-virtual-changer-test b/regress/tests/big-virtual-changer-test index 43fd6464ee..97ae4362ba 100755 --- a/regress/tests/big-virtual-changer-test +++ b/regress/tests/big-virtual-changer-test @@ -37,7 +37,7 @@ cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=10 storage=Virtual @@ -121,7 +121,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=Virtual done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/big-vol-test b/regress/tests/big-vol-test index 21e4167737..fafbe55fd5 100755 --- a/regress/tests/big-vol-test +++ b/regress/tests/big-vol-test @@ -17,7 +17,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=100 storage=File @@ -45,7 +45,7 @@ fi cd ${cwd} cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out sql @@ -62,12 +62,11 @@ messages sql SELECT * FROM JobMedia; -@output ${cwd}/tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File select all done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/broken-media-bug-2-test b/regress/tests/broken-media-bug-2-test index d57a8d1a2a..a735ba7dfd 100755 --- a/regress/tests/broken-media-bug-2-test +++ b/regress/tests/broken-media-bug-2-test @@ -43,7 +43,7 @@ dd if=/dev/urandom of="$hugefile" bs=1M count="$hugefilesize" echo "Done" cat >tmp/bconcmds <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out setdebug level=2 storage=DDS-4 @@ -79,7 +79,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 8c98c1e3e7..315f86853f 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -22,7 +22,7 @@ change_jobname NightlySave $JobName start_test cat <tmp/bconcmds -@output /dev/null +@$out /dev/null estimate job=$JobName listing estimate job=$JobName listing messages @@ -124,7 +124,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 20ac940a3e..49e3acf36d 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -84,7 +84,6 @@ restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select al yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 068ae10927..d76e773657 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -41,7 +41,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/bsr-read-test b/regress/tests/bsr-read-test index 5d0003d11a..d8df4715ec 100755 --- a/regress/tests/bsr-read-test +++ b/regress/tests/bsr-read-test @@ -96,7 +96,6 @@ done yes wait messages -@$out update volume=TestVolume001 volstatus=Used run job=migrate-job jobid=1 yes run job=migrate-job jobid=2 yes diff --git a/regress/tests/bug-1227 b/regress/tests/bug-1227 index b7dbff1b5a..4ef4710e87 100755 --- a/regress/tests/bug-1227 +++ b/regress/tests/bug-1227 @@ -19,7 +19,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default diff --git a/regress/tests/bvfs-test b/regress/tests/bvfs-test index 8671d8a101..7e1d1170e2 100755 --- a/regress/tests/bvfs-test +++ b/regress/tests/bvfs-test @@ -24,7 +24,7 @@ change_jobname CompressedTest $JobName start_test cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out label storage=File volume=TestVolume001 @@ -45,7 +45,7 @@ echo "ficheriro1.txt" >${tmpsrc}/ficheriro1.txt cp -f ${tmpsrc}/dird.c ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out @# Force Incremental on the second Volume @@ -63,7 +63,7 @@ touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -81,7 +81,7 @@ sed "s%a%b%g" 1 >ficheriro2.txt rm -f 1 cd ${cwd} cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Differential job=$JobName yes @@ -96,7 +96,7 @@ sleep 1 touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -111,7 +111,7 @@ sleep 1 touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -126,7 +126,7 @@ sleep 1 touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -141,7 +141,7 @@ touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -157,7 +157,6 @@ yes wait status storage=File messages -@output quit END_OF_DATA diff --git a/regress/tests/cancel-test b/regress/tests/cancel-test index 578b2d59e5..0ecfb8969e 100755 --- a/regress/tests/cancel-test +++ b/regress/tests/cancel-test @@ -74,7 +74,7 @@ start_test when=`perl -MPOSIX -e "print strftime('%F %T', localtime(time+6000))"` cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/logfile1.out @################################################################ diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test index d4eb0cae52..e0924ee8d6 100755 --- a/regress/tests/compress-encrypt-test +++ b/regress/tests/compress-encrypt-test @@ -35,7 +35,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 47fc8e4362..c85c403999 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -15,7 +15,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out status all @@ -36,7 +36,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 8726113f27..3e30f6884a 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -31,7 +31,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 diff --git a/regress/tests/copy-job-test b/regress/tests/copy-job-test index 7724cac352..6fa2f04722 100755 --- a/regress/tests/copy-job-test +++ b/regress/tests/copy-job-test @@ -29,7 +29,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @# setdebug level=100 storage=File @@ -77,7 +77,6 @@ yes list volumes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/copy-jobspan-test b/regress/tests/copy-jobspan-test index 78025fd2af..f06566e11c 100755 --- a/regress/tests/copy-jobspan-test +++ b/regress/tests/copy-jobspan-test @@ -32,7 +32,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=10 dir @@ -69,7 +69,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/copy-time-test b/regress/tests/copy-time-test index 5e88cbd332..f5d926024f 100755 --- a/regress/tests/copy-time-test +++ b/regress/tests/copy-time-test @@ -28,7 +28,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default @@ -69,7 +69,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/copy-uncopied-test b/regress/tests/copy-uncopied-test index e4dfb24017..07e535c37b 100755 --- a/regress/tests/copy-uncopied-test +++ b/regress/tests/copy-uncopied-test @@ -34,7 +34,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default diff --git a/regress/tests/copy-upgrade-test b/regress/tests/copy-upgrade-test index ed8a7b8d16..99d4ebfc6d 100755 --- a/regress/tests/copy-upgrade-test +++ b/regress/tests/copy-upgrade-test @@ -30,7 +30,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @# setdebug level=100 storage=File @@ -109,7 +109,6 @@ yes list volumes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/copy-volume-test b/regress/tests/copy-volume-test index 106aa76492..2783299f38 100755 --- a/regress/tests/copy-volume-test +++ b/regress/tests/copy-volume-test @@ -32,7 +32,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default @@ -93,7 +93,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test index 581b8a219c..8ef59c367f 100755 --- a/regress/tests/data-encrypt-test +++ b/regress/tests/data-encrypt-test @@ -36,7 +36,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/debug-test b/regress/tests/debug-test index f1e95362da..92fecc3dc3 100755 --- a/regress/tests/debug-test +++ b/regress/tests/debug-test @@ -14,7 +14,7 @@ rm -f ${cwd}/working/*trace* start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root index 0d005e56b7..838d5d1028 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -16,9 +16,9 @@ echo "/dev" >${cwd}/tmp/file-list start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=NightlySave yes wait @@ -26,12 +26,11 @@ messages @# @# now do a restore @# -@output ${cwd}/tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/differential-test b/regress/tests/differential-test index 4d95637a58..0a8ee55ad9 100755 --- a/regress/tests/differential-test +++ b/regress/tests/differential-test @@ -48,7 +48,6 @@ update volume=TestVolume002 VolStatus=Used run level=differential job=$JobName yes wait messages -@$out END_OF_DATA run_bconsole @@ -71,7 +70,6 @@ restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-l yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/eighty-simultaneous-jobs-tape b/regress/tests/eighty-simultaneous-jobs-tape index 6d6aaa09e7..560fad68f5 100755 --- a/regress/tests/eighty-simultaneous-jobs-tape +++ b/regress/tests/eighty-simultaneous-jobs-tape @@ -17,7 +17,7 @@ change_jobname $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -122,7 +122,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/encrypt-bug-test b/regress/tests/encrypt-bug-test index 93f2b2ef35..2a5b47f794 100755 --- a/regress/tests/encrypt-bug-test +++ b/regress/tests/encrypt-bug-test @@ -45,7 +45,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/eot-fail-tape b/regress/tests/eot-fail-tape index 4113ccf3f2..3ba6d725d3 100755 --- a/regress/tests/eot-fail-tape +++ b/regress/tests/eot-fail-tape @@ -12,20 +12,20 @@ scripts/copy-tape-confs echo "${cwd}/build" >${cwd}/tmp/file-list -out="${cwd}/tmp/sed_tmp" -echo "s%# Maximum File Size% Maximum File Size%g" >${out} +outf="${cwd}/tmp/sed_tmp" +echo "s%# Maximum File Size% Maximum File Size%g" >${outf} cp -f ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf +sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf change_jobname $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -#update Volume=TestVolume001 MaxVolBytes=3000000 +@#update Volume=TestVolume001 MaxVolBytes=3000000 run job=$JobName yes wait messages @@ -37,7 +37,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@tee quit END_OF_DATA diff --git a/regress/tests/errors-test b/regress/tests/errors-test index 5a57c42350..0b9865e4dd 100755 --- a/regress/tests/errors-test +++ b/regress/tests/errors-test @@ -18,9 +18,9 @@ echo "${cwd}/build/po" >${cwd}/tmp/file-list start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/LOCAL_INC_ERR.log +@$out ${cwd}/tmp/LOCAL_INC_ERR.log label storage=File volume=TestVolume001 add storage=File2 1 @@ -29,11 +29,11 @@ File2 run job=LOCAL_INC_ERR yes wait messages -@output ${cwd}/tmp/REMOTE_INC_ERR.log +@$out ${cwd}/tmp/REMOTE_INC_ERR.log run job=REMOTE_INC_ERR yes wait messages -@output ${cwd}/tmp/LOCAL_EXCL_ERR.log +@$out ${cwd}/tmp/LOCAL_EXCL_ERR.log run job=LOCAL_EXCL_ERR yes wait messages diff --git a/regress/tests/estimate-test b/regress/tests/estimate-test index ce794a72a1..376230abfa 100755 --- a/regress/tests/estimate-test +++ b/regress/tests/estimate-test @@ -26,7 +26,7 @@ mkdir ${cwd}/build/src/test touch ${cwd}/build/src/test/test1 ${cwd}/build/src/test/test2 cat <$tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out $tmp/log1.out label volume=TestVolume001 storage=File pool=Default @@ -41,7 +41,6 @@ restore where=$tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA @@ -53,7 +52,7 @@ check_restore_diff mv ${cwd}/build/src/test ${cwd}/build/po/test cat <$tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out $tmp/log3.out estimate listing job=$JobName level=incremental @@ -64,7 +63,7 @@ END_OF_DATA run_bconsole cat <$tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out $tmp/log4.out estimate listing job=$JobName level=incremental accurate=yes @@ -78,7 +77,7 @@ cp $scripts/bacula-dir.conf $tmp/1 sed 's/JobDefs {/JobDefs { Accurate=yes/' $tmp/1>$scripts/bacula-dir.conf cat <$tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out $tmp/log5.out reload @@ -90,7 +89,7 @@ END_OF_DATA run_bconsole cat <$tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out $tmp/log6.out estimate listing job=$JobName level=incremental accurate=no diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root index 50a45f2cbf..9ba0b1105c 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -13,9 +13,9 @@ echo "/etc" >${cwd}/tmp/file-list start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File TestVolume001 run job=NightlySave @@ -25,7 +25,7 @@ messages @# @# now do a restore @# -@output ${cwd}/tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select unmark * mark * @@ -33,7 +33,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test index dc9101a3ae..545e9bf7e2 100755 --- a/regress/tests/fast-two-pool-test +++ b/regress/tests/fast-two-pool-test @@ -28,7 +28,7 @@ start_test # Write out bconsole commands to a file cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=150 storage=DDS-4 @@ -62,7 +62,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test index c0dcd4232f..dffdf67797 100755 --- a/regress/tests/fifo-test +++ b/regress/tests/fifo-test @@ -44,7 +44,6 @@ restore where=/ select all storage=File1 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/fileregexp-test b/regress/tests/fileregexp-test index 11e8f141aa..caf15fa89d 100755 --- a/regress/tests/fileregexp-test +++ b/regress/tests/fileregexp-test @@ -24,7 +24,7 @@ change_jobname BackupClient1 $JobName start_test cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out label volume=TestVolume001 storage=File pool=Default @@ -44,7 +44,6 @@ README yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape index 7ba4d453b8..bc5eba1f78 100755 --- a/regress/tests/fixed-block-size-tape +++ b/regress/tests/fixed-block-size-tape @@ -51,7 +51,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 8fc617f24c..64471f3805 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -17,7 +17,7 @@ change_jobname $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -49,7 +49,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index fbcdf23d5c..8d93599352 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -17,7 +17,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 @@ -99,7 +99,6 @@ run job=$JobName level=Full Storage=File1 yes wait @#reload messages -@output quit END_OF_DATA diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index e3505277da..6ccb740636 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -119,7 +119,6 @@ yes mount storage=DDS-4 wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index b13a3ddd93..1a56a87037 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -16,7 +16,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null estimate job=$JobName listing estimate job=$JobName estimate job=$JobName @@ -40,7 +40,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # run a second job # cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out run job=$JobName yes @@ -59,9 +59,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # run a third job # cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName yes wait messages @@ -78,9 +78,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # run a fourth job # cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName yes wait messages @@ -95,7 +95,7 @@ echo "Backup 4 done" # now do several restores to ensure we cleanup between jobs # cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null restore where=${cwd}/tmp/bacula-restores select all storage=File done yes wait @@ -110,7 +110,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test index f3b560af07..b7b9d1c8ce 100755 --- a/regress/tests/gigaslam-sparse-test +++ b/regress/tests/gigaslam-sparse-test @@ -22,7 +22,7 @@ cd ${cwd} start_test cat >${cwd}/tmp/bconcmds <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -43,7 +43,7 @@ echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes @@ -60,7 +60,6 @@ restore where=${cwd}/tmp/bacula-restores storage=DDS-4 yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 91753ce95f..b7dca52000 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -21,7 +21,7 @@ change_jobname CompressedTest $JobName start_test cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out @#setdebug level=100 storage=File @@ -45,7 +45,7 @@ echo "ficheriro1.txt" >${tmpsrc}/ficheriro1.txt cp -f ${tmpsrc}/dird.c ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out @# Force Incremental on the second Volume @@ -63,7 +63,7 @@ touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -81,7 +81,7 @@ sed "s%a%b%g" 1 >ficheriro2.txt rm -f 1 cd ${cwd} cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Differential job=$JobName yes @@ -96,7 +96,7 @@ sleep 1 touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -111,7 +111,7 @@ sleep 1 touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -126,7 +126,7 @@ sleep 1 touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out run level=Incremental job=$JobName yes @@ -141,7 +141,7 @@ touch ${tmpsrc}/ficheriro1.txt touch ${tmpsrc}/ficheriro2.txt cat <${tmp}/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${tmp}/log1.out setdebug level=200 storage=File @@ -158,7 +158,6 @@ yes wait status storage=File messages -@output quit END_OF_DATA diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root index 9044d1c088..0ee005adc9 100755 --- a/regress/tests/lib-tape-root +++ b/regress/tests/lib-tape-root @@ -16,9 +16,9 @@ echo " " echo " " cat < >${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 Volume=TestVolume001 slot=0 run job=NightlySave yes wait @@ -26,12 +26,11 @@ messages @# @# now do a restore @# -@output ${cwd}/tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root index 54da62c7d4..48067b2557 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -16,9 +16,9 @@ echo "/lib" >${cwd}/tmp/file-list start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output ${cwd}/tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File TestVolume001 run job=NightlySave @@ -28,7 +28,7 @@ messages @# @# now do a restore @# -@output ${cwd}/tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select unmark * mark * @@ -36,7 +36,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/manual-two-vol-tape b/regress/tests/manual-two-vol-tape index 3dbcaaeaa3..1b8a155289 100755 --- a/regress/tests/manual-two-vol-tape +++ b/regress/tests/manual-two-vol-tape @@ -97,7 +97,6 @@ unmount storage=DDS-4 list volumes messages wait -@$out quit END_OF_DATA diff --git a/regress/tests/maxvol-test b/regress/tests/maxvol-test index a671c0b3d2..0b33c7813f 100755 --- a/regress/tests/maxvol-test +++ b/regress/tests/maxvol-test @@ -21,7 +21,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 @@ -55,7 +55,6 @@ wait @#reload @#reload messages -@output quit END_OF_DATA diff --git a/regress/tests/maxvol2-test b/regress/tests/maxvol2-test index 7fe6c2befe..1bb3bcd6f9 100755 --- a/regress/tests/maxvol2-test +++ b/regress/tests/maxvol2-test @@ -17,7 +17,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 @@ -79,7 +79,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/memory-bug-tape b/regress/tests/memory-bug-tape index 15f5c89158..a8379ceedf 100755 --- a/regress/tests/memory-bug-tape +++ b/regress/tests/memory-bug-tape @@ -20,7 +20,7 @@ change_jobname $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -20047,7 +20047,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test index 1115ef0910..16ca0e363c 100755 --- a/regress/tests/migration-job-test +++ b/regress/tests/migration-job-test @@ -26,7 +26,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=000 storage=File @@ -73,7 +73,6 @@ yes list volumes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test index 6fadb3a107..b0024a1fc2 100755 --- a/regress/tests/migration-jobspan-test +++ b/regress/tests/migration-jobspan-test @@ -31,7 +31,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=10 dir @@ -69,7 +69,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test index 21a0d48ecc..fa2b53011a 100755 --- a/regress/tests/migration-occupancy-test +++ b/regress/tests/migration-occupancy-test @@ -26,7 +26,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default @@ -57,7 +57,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test index c886133900..3181e6d586 100755 --- a/regress/tests/migration-time-test +++ b/regress/tests/migration-time-test @@ -26,7 +26,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default @@ -64,7 +64,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test index 13f7e67196..dc951eaeb6 100755 --- a/regress/tests/migration-volume-test +++ b/regress/tests/migration-volume-test @@ -28,7 +28,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default @@ -89,7 +89,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test index fb61105d19..d0884cb13d 100755 --- a/regress/tests/multi-client-test +++ b/regress/tests/multi-client-test @@ -17,7 +17,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @# Make sure we can contact all clients @@ -59,7 +59,6 @@ done yes wait messages -@output status dir status storage=File1 quit diff --git a/regress/tests/multi-storage-test b/regress/tests/multi-storage-test index 048dee3fb2..9bf0b4dc9c 100755 --- a/regress/tests/multi-storage-test +++ b/regress/tests/multi-storage-test @@ -77,7 +77,6 @@ setdebug trace=1 level=110 director restore where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/plugin-test b/regress/tests/plugin-test index a7aa70538e..00e7d2d53d 100755 --- a/regress/tests/plugin-test +++ b/regress/tests/plugin-test @@ -15,7 +15,7 @@ echo "${cwd}/README" >${cwd}/tmp/file-list start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 @@ -44,7 +44,6 @@ yes wait setdebug level=0 client=$CLIENT messages -@$out quit END_OF_DATA @@ -72,7 +71,6 @@ restore where=${cwd}/tmp select all storage=File1 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/query-test b/regress/tests/query-test index a4d365e1fe..1e0730960c 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -22,7 +22,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 @@ -41,7 +41,7 @@ echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @# Force differental on the second Volume @@ -49,7 +49,6 @@ update volume=TestVolume001 VolStatus=Used run level=differental job=$JobName yes wait messages -@output END_OF_DATA run_bacula @@ -58,7 +57,7 @@ stop_bacula echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out run level=incremental job=$JobName yes @@ -102,7 +101,6 @@ restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-l yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 701a0083e7..467d959052 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -22,7 +22,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 @@ -88,7 +88,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape index ac5a8e6db4..80e0f09e23 100755 --- a/regress/tests/relabel-tape +++ b/regress/tests/relabel-tape @@ -19,7 +19,7 @@ change_jobname $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=150 storage=DDS-4 @@ -49,7 +49,6 @@ run job=$JobName level=Full yes wait list volumes messages -@$out quit END_OF_DATA @@ -88,7 +87,6 @@ yes mount storage=DDS-4 wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index 060a43e73a..990c2b8c0b 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -25,7 +25,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -40,7 +40,6 @@ restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2 yes wait messages -@output quit END_OF_DATA @@ -61,7 +60,7 @@ for i in `cat ${cwd}/tmp/restore2-list`; do done cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out run job=$JobName level=Full yes @@ -78,7 +77,6 @@ restore where=${cwd}/tmp/bacula-restores yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index 04b448d82d..a01c409a25 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -24,7 +24,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 @@ -102,7 +102,6 @@ restore where=${cwd}/tmp/bacula-restores storage=File yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 38fc0f7b7b..3f6db5d143 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -73,7 +73,6 @@ restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=F yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape index 041c278deb..deb06ff7d6 100755 --- a/regress/tests/restore-seek-tape +++ b/regress/tests/restore-seek-tape @@ -76,7 +76,6 @@ restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=D yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index 1a4553ab14..7b3c2ecee0 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -15,7 +15,7 @@ change_jobname CompressedTest $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 @@ -30,7 +30,6 @@ restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2- yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test index 11016ff4ed..d73e1e07e5 100755 --- a/regress/tests/scratch-pool-test +++ b/regress/tests/scratch-pool-test @@ -59,7 +59,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/scratchpool-pool-test b/regress/tests/scratchpool-pool-test index dc019ca3cc..814f6eef64 100755 --- a/regress/tests/scratchpool-pool-test +++ b/regress/tests/scratchpool-pool-test @@ -75,7 +75,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index bebf0dd61b..3bc11d2607 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -27,7 +27,7 @@ change_jobname MultiVol $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=150 storage=File @@ -55,7 +55,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index 7000b0de9f..dc0dc89561 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -20,7 +20,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -39,7 +39,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/source-addr-test b/regress/tests/source-addr-test index 3e7a9d44c0..1120d3ca8c 100755 --- a/regress/tests/source-addr-test +++ b/regress/tests/source-addr-test @@ -57,7 +57,7 @@ change_jobname BackupClient1 $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#label volume=TestVolume001 storage=File pool=Default @@ -89,7 +89,7 @@ if [ "$debug" = 1 ] ; then fi cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label volume=TestVolume001 storage=File pool=Default @@ -104,7 +104,6 @@ restore where=${cwd}/tmp/bacula-restores select all done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index d687c7d526..4f3cdd8ab9 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -17,7 +17,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume004 @@ -42,7 +42,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index 47e05e41c1..8226371a13 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -15,7 +15,7 @@ echo "${cwd}/build" >${cwd}/tmp/file-list start_test cat >${cwd}/tmp/bconcmds <${cwd}/tmp/file-list start_test cat >${cwd}/tmp/bconcmds <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out label volume=TestVolume001 storage=File pool=Default diff --git a/regress/tests/strip-test b/regress/tests/strip-test index d29837235b..253cfbdc3f 100755 --- a/regress/tests/strip-test +++ b/regress/tests/strip-test @@ -56,7 +56,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=FileStorage done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/three-pool-recycle-test b/regress/tests/three-pool-recycle-test index 0069935c67..657c373201 100755 --- a/regress/tests/three-pool-recycle-test +++ b/regress/tests/three-pool-recycle-test @@ -28,7 +28,7 @@ start_test # Write out bconsole commands to a file cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=150 storage=DDS-4 @@ -93,7 +93,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test index 2eaf7d0c48..7a86a9d0d4 100755 --- a/regress/tests/three-pool-test +++ b/regress/tests/three-pool-test @@ -30,7 +30,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=DDS-4 @@ -69,7 +69,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/tls-authenticate-test b/regress/tests/tls-authenticate-test index 10fadd2be6..bded674a21 100755 --- a/regress/tests/tls-authenticate-test +++ b/regress/tests/tls-authenticate-test @@ -15,7 +15,7 @@ change_jobname CompressedTest $JobName start_test cat <tmp/bconcmds -@output +@$out /dev/null messages @$out tmp/log1.out setdebug level=100 dir @@ -39,7 +39,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/tls-test b/regress/tests/tls-test index 8e8899408e..f390f2ce57 100755 --- a/regress/tests/tls-test +++ b/regress/tests/tls-test @@ -15,7 +15,6 @@ change_jobname CompressedTest $JobName start_test cat <tmp/bconcmds -@output messages @$out tmp/log1.out status all @@ -36,7 +35,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape index c1a12d481e..382692cacf 100755 --- a/regress/tests/truncate-bug-tape +++ b/regress/tests/truncate-bug-tape @@ -17,7 +17,7 @@ change_jobname NightlySave $JobName start_test cat <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @@ -45,7 +45,7 @@ run_bacula scripts/check_for_zombie_jobs storage=DDS-4 cat <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log2.out @# @@ -62,7 +62,6 @@ done yes wait messages -@output quit END_OF_DATA @@ -71,7 +70,7 @@ scripts/check_for_zombie_jobs storage=DDS-4 # Now write to tape one more time cat <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log3.out run level=Full job=$JobName yes diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index b8f8e8f87f..ef88177e9a 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -17,9 +17,9 @@ start_test cat >tmp/bconcmds <tmp/bconcmds <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Full drive=$DRIVE1 @@ -61,7 +61,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test index b0a48ec645..bc154bc6fb 100755 --- a/regress/tests/two-pool-test +++ b/regress/tests/two-pool-test @@ -28,7 +28,7 @@ start_test # Write out bconsole commands to a file cat <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out setdebug level=150 storage=DDS-4 @@ -63,7 +63,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 15f48ee5b2..a6d84ee1f0 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -33,7 +33,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=File1 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/two-volume-changer b/regress/tests/two-volume-changer index 8f3b5f8ebd..49cbb036b4 100755 --- a/regress/tests/two-volume-changer +++ b/regress/tests/two-volume-changer @@ -67,7 +67,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index 84a4228d3e..f14f999b26 100755 --- a/regress/tests/two-volume-test +++ b/regress/tests/two-volume-test @@ -55,7 +55,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root index 8d551aca66..b1e15726d2 100755 --- a/regress/tests/usr-tape-root +++ b/regress/tests/usr-tape-root @@ -16,9 +16,9 @@ echo " " echo " " cat < ${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages -@output tmp/log1.out +@$out tmp/log1.out label storage=DDS-4 Volume=TestVolume001 slot=0 run job=NightlySave yes wait @@ -26,7 +26,7 @@ messages @# @# now do a restore @# -@output tmp/log2.out +@$out tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all done yes wait diff --git a/regress/tests/verify-cat-test b/regress/tests/verify-cat-test index 909dfedc32..eebd4b34ab 100755 --- a/regress/tests/verify-cat-test +++ b/regress/tests/verify-cat-test @@ -31,7 +31,6 @@ messages run job=VerifyVolume level=Catalog yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape index b1e79b98c7..261251511c 100755 --- a/regress/tests/verify-vol-tape +++ b/regress/tests/verify-vol-tape @@ -34,7 +34,6 @@ run job=VerifyTape pool=Default yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index c51228d8ea..36368e5dac 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -44,7 +44,6 @@ run job=VerifyVolume level=DiskToCatalog yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/verify-voltocat-test b/regress/tests/verify-voltocat-test index 14447950d1..99f758e5b1 100755 --- a/regress/tests/verify-voltocat-test +++ b/regress/tests/verify-voltocat-test @@ -43,7 +43,6 @@ run job=VerifyVolume level=VolumeToCatalog yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/virtual-backup-test b/regress/tests/virtual-backup-test index 69f1fb69fd..800ab152c1 100755 --- a/regress/tests/virtual-backup-test +++ b/regress/tests/virtual-backup-test @@ -26,7 +26,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output +@$out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=100 storage=File @@ -86,7 +86,6 @@ wait list volumes list jobs messages -@output quit END_OF_DATA diff --git a/regress/tests/virtual-backup2-test b/regress/tests/virtual-backup2-test index a2fa24b3f9..fd93c30c1a 100755 --- a/regress/tests/virtual-backup2-test +++ b/regress/tests/virtual-backup2-test @@ -26,7 +26,7 @@ start_test # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=150 storage=DiskChanger @@ -133,7 +133,6 @@ wait list jobs list volumes messages -@output quit END_OF_DATA diff --git a/regress/tests/virtual-changer-test b/regress/tests/virtual-changer-test index 7c06fcbfc9..a937ddaab6 100755 --- a/regress/tests/virtual-changer-test +++ b/regress/tests/virtual-changer-test @@ -42,7 +42,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=200 storage=Virtual @@ -81,7 +81,6 @@ restore where=${cwd}/tmp/bacula-restores select all storage=Virtual done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/vol-duration-changer b/regress/tests/vol-duration-changer index 1ffda0fff1..e7ff5e0ff9 100755 --- a/regress/tests/vol-duration-changer +++ b/regress/tests/vol-duration-changer @@ -26,7 +26,7 @@ change_jobname NightlySave $JobName start_test cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log1.out setdebug level=100 storage=DDS-4 @@ -51,7 +51,6 @@ done yes wait messages -@output quit END_OF_DATA diff --git a/regress/tests/vtape-test-changer b/regress/tests/vtape-test-changer index e866200e18..b64335110b 100755 --- a/regress/tests/vtape-test-changer +++ b/regress/tests/vtape-test-changer @@ -37,7 +37,7 @@ clientname=`awk '/Name = .*-fd/ { if (!ok) { print $3 ; ok=1 } }' bin/bacula-dir # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out ${cwd}/tmp/log6.out @#setdebug level=200 storage=LTO1 @@ -141,4 +141,3 @@ if test $? = 0; then fi end_test - diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 920ca7c60a..bd211f0b1d 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -54,7 +54,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index 9a8e1dce3b..9db7b5695e 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -35,7 +35,7 @@ label storage=File volume=TestVolume001 run job=$JobName yes wait messages -@$out +@output quit END_OF_DATA @@ -65,7 +65,6 @@ done yes wait messages -@$out quit END_OF_DATA diff --git a/regress/tests/win32-backup-tape b/regress/tests/win32-backup-tape index 4afd093536..6b9b7c0626 100755 --- a/regress/tests/win32-backup-tape +++ b/regress/tests/win32-backup-tape @@ -19,7 +19,7 @@ change_jobname $JobName start_test cat <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape index 366a88e1d6..1ba47eee2e 100755 --- a/regress/tests/win32-to-linux-tape +++ b/regress/tests/win32-to-linux-tape @@ -19,7 +19,7 @@ change_job $JobName start_test cat <tmp/bconcmds -@output /dev/null +@$out /dev/null messages @$out tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 -- 2.39.5