Many debug code fixes in regression scripts

diff --git a/bacula/technotes b/bacula/technotes
index 58a64f8a78d6eec6f7dd9f4fb6b9e4b97acaf28c..718907cb19e7c14a18547ca09b229ad2f161163f 100644 (file)
--- 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 81418ad02ebb353949fa051bba78a50398feb071..ae606e1895cf644bb972ac3df6f2ad8dc04e39ae 100644 (file)
--- 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 67450591db2cf5fa61e23a1a9e350e30c39e4043..f4917915d978c8013174919744a9993d5e2b2508 100755 (executable)
--- 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 <<END_OF_DATA >${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 fd3b19a004bd830d8aca981a06db999d02e470bc..d7f8880d86a254190ebc8c0a2bd1f02e8033d577 100755 (executable)
--- 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 <<END_OF_DATA >${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 6a7d91bbd913152f2ac80a1aa6d3c0f429bd8c64..878c2487605a98dff07bdf6cecd38423afcb6a8e 100755 (executable)
--- a/regress/tests/2drive-3pool-test
+++ b/regress/tests/2drive-3pool-test
@@ -30,7 +30,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 038b9ad3963fc01991ff717bd8531c9676a4cfa2..5f9015e00584bc89a476dce80184e9d9535eecf8 100755 (executable)
--- a/regress/tests/2drive-concurrent-test
+++ b/regress/tests/2drive-concurrent-test
@@ -20,7 +20,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 43863d8b7832601bf14e66db4124c819ecfb8103..2e3bcbe21c6505fd0598ce023a9399c3a6340c64 100755 (executable)
--- 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 <<END_OF_DATA >${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 d94a7af8f45e5e9beafcbdd7549c77eb856b8f55..f78c6c3b6c6645a66df87b8bae6b4d7865060a25 100755 (executable)
--- a/regress/tests/2drive-incremental-changer
+++ b/regress/tests/2drive-incremental-changer
@@ -40,7 +40,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 93c63918b80826018501c7fa33ae911484fd906c..0febc57ae5590ee34100506a796add6656cf8ac8 100755 (executable)
--- 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 <<END_OF_DATA >${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 d96f6e8b160cced0ffac33990db7c1d97adf4712..cd2bb97615f7243f2711fcaadc98a0f55801b3ca 100755 (executable)
--- 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 <<END_OF_DATA >${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 63f3d8a1ef4e83d02943b650818ef991a34950e8..001d1106d585de3cb6fba8cdb978b686421b8623 100755 (executable)
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -50,7 +50,7 @@ echo ${cwd}/build > ${cwd}/tmp/file-list
 start_test
 
 cat <<END_OF_DATA >${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 c0c6f46aa03fbe05fd9d95054251a3950a37ece5..6e1c89f122bc6cd186a9666ebdce02c54394992b 100755 (executable)
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -68,7 +68,7 @@ change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${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 d8d3b48f0579bb7151cec2c2f35135792a7e823b..d8ce5ecf78db8013893bee2c5443cfffb0e02a19 100755 (executable)
--- a/regress/tests/ansi-label-tape
+++ b/regress/tests/ansi-label-tape
@@ -25,7 +25,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 b77ee6423cfcf14dcb4de566c120660165518749..681c39df490e845572661a2b0cbbd458c9f843a3 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -18,7 +18,7 @@ change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_SCRIPT >${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 2e0fb1cbc7772de4c0d692181432305cab656e6d..eb4a664f648233b6c003ade4fba6c5b7086e4011 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -23,7 +23,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 25d2e76d498101254e9653bb8d5ed99805fa04be..a21bca9749d7df17bb3fc93310bbfd0aa6b80ad6 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -23,7 +23,7 @@ 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
 

diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null
index a8b2af2f390d027efb8c694fd5121f14801924e9..7540d2fbbe45e8d57c300a3506f955c33a6550ed 100755 (executable)
--- a/regress/tests/backup-to-null
+++ b/regress/tests/backup-to-null
@@ -22,7 +22,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 36c556caa8bef4d0811ab96aae6b9e317651cc13..7b9648403a8519ac1cc22d047c4fba8c51dd61a5 100755 (executable)
--- a/regress/tests/backup-win32-tape
+++ b/regress/tests/backup-win32-tape
@@ -20,7 +20,7 @@ start_test
 
 
 cat <<END_OF_DATA >${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 11020b614c4cdd54298d4cb1bd462130c93382fa..c27b17e28c3abb6d7648634b04e35f490bf233ff 100755 (executable)
--- 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 3aa8a194ae2b978acf8d1824f5f9762199a309dd..fa603e99df77941c6c59c180eee53ec40f1422a6 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -16,7 +16,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 338b21f52c5aec0d379b0a488e90582551432881..04c543bb403d341c07c305d8b89de2ba293aafa3 100755 (executable)
--- a/regress/tests/big-files-test
+++ b/regress/tests/big-files-test
@@ -29,7 +29,7 @@ change_jobname MonsterFileSet $JobName
 start_test
 
 cat <<END_OF_SCRIPT >${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 f5b6d9f071e683887d8b429eb67156e777ce6cc3..b0028eeabc8862dda61f90f43cf711e3a430fe1b 100755 (executable)
--- a/regress/tests/big-fileset-test
+++ b/regress/tests/big-fileset-test
@@ -18,7 +18,7 @@ change_jobname MonsterFileSet $JobName
 start_test
 
 cat <<END_OF_SCRIPT >${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 43fd6464ee73850b11b8968bb9ad856953cf7ce8..97ae4362bab50ffe25626e3093fd61b936f8bd6a 100755 (executable)
--- 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 <<END_OF_DATA >${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 21e4167737db407728a4794c629bb85c51c3a1a5..fafbe55fd530c0921e3a1022557f400ed5a631f4 100755 (executable)
--- a/regress/tests/big-vol-test
+++ b/regress/tests/big-vol-test
@@ -17,7 +17,7 @@ change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 d57a8d1a2ab4dc4dfb29f030cd5cea73cc28b9ed..a735ba7dfd4474cf3e6c7665f185750984b07db0 100755 (executable)
--- 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 <<END_OF_DATA
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
 setdebug level=150  storage=File

diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape
index 81dd387348b82fb965b0fadb34c5457e9b6c5a0d..3f9f8e6dfa9d3b9b6e710525cc162a7567f6150f 100755 (executable)
--- a/regress/tests/bscan-fast-tape
+++ b/regress/tests/bscan-fast-tape
@@ -22,7 +22,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >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 8c98c1e3e7141bba516cb3f576a344309949c09c..315f86853f8c09f5a8191e22fdab3ad6db1a736e 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -22,7 +22,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >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 20ac940a3eba22d353c93ce80f1e9b366fad5344..49e3acf36d33b8674ef86df9cf49a3f42bf9f2f1 100755 (executable)
--- 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 068ae1092734c2b7e1826831bd630f3d2edb88cd..d76e7736572c2451bb3c6c2f46c7696f9c8d98f9 100755 (executable)
--- 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 5d0003d11a5499fff2b570a9cc0e6a87f08c2665..d8df4715ec98b762a6e06434a21f675006574eee 100755 (executable)
--- 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 b7dbff1b5abd7dad8cf3ae626dcfa769170fca51..4ef4710e87a06bd8575a488b5a78090a1d7aa6a5 100755 (executable)
--- a/regress/tests/bug-1227
+++ b/regress/tests/bug-1227
@@ -19,7 +19,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 8671d8a1012a1e08a153943cf27029e32ef38872..7e1d1170e21d470a813854304c2aec75ae918f98 100755 (executable)
--- a/regress/tests/bvfs-test
+++ b/regress/tests/bvfs-test
@@ -24,7 +24,7 @@ change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 578b2d59e546d387458f8dc169ee8ff51f4ba822..0ecfb8969edb9f6751d677c7246e16ff646d532c 100755 (executable)
--- 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 <<END_OF_DATA >${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 d4eb0cae521f763dd9ca67904e3f414542c347f1..e0924ee8d6623935b22040ce0a715ce2eff8aa0c 100755 (executable)
--- 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 47fc8e4362e392ccc39957cab40a26915de8a190..c85c403999b6744033beca46eb6f90a2b016acf8 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -15,7 +15,7 @@ change_jobname CompressedTest $JobName
 start_test
       
 cat <<END_OF_DATA >${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 8726113f27d5b869dc49af79054cc1f7a974be65..3e30f6884a780c31f7a291f93f662ca90d0f9316 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -31,7 +31,7 @@ change_jobname CompressedTest $JobName
 start_test
      
 cat <<END_OF_DATA >${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 7724cac3522edea7fb7130cc45e1f47f8852664e..6fa2f0472296e20320f80cbe74b43ef26ddea58c 100755 (executable)
--- a/regress/tests/copy-job-test
+++ b/regress/tests/copy-job-test
@@ -29,7 +29,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 78025fd2af713e6252dfbc07df97231a19cb3265..f06566e11cca9dccb974b162d0b906a61fedc9f3 100755 (executable)
--- a/regress/tests/copy-jobspan-test
+++ b/regress/tests/copy-jobspan-test
@@ -32,7 +32,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 5e88cbd332138806288d806d74746142d829efec..f5d926024fdf047b2b0059fa8493eb13b81c37e7 100755 (executable)
--- a/regress/tests/copy-time-test
+++ b/regress/tests/copy-time-test
@@ -28,7 +28,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 e4dfb240179b23e0f9ecd3f801c0afdf29b75ed2..07e535c37bcbc23379fbc9d56db88888dec04452 100755 (executable)
--- a/regress/tests/copy-uncopied-test
+++ b/regress/tests/copy-uncopied-test
@@ -34,7 +34,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 ed8a7b8d16f5d7b06131f81424c2494a7cc5119f..99d4ebfc6d807c0ff9b98d7cc7fd49b8eeccc6d8 100755 (executable)
--- a/regress/tests/copy-upgrade-test
+++ b/regress/tests/copy-upgrade-test
@@ -30,7 +30,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 106aa76492e92f9792b8f14f6a9e71df5941b234..2783299f38c063a9fea2f54a028cdded6cd446b9 100755 (executable)
--- a/regress/tests/copy-volume-test
+++ b/regress/tests/copy-volume-test
@@ -32,7 +32,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 581b8a219cb42b332f9660b320faf30603b151c7..8ef59c367f50ebd073522e7408897bb7d972e6d1 100755 (executable)
--- 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 f1e95362dad3c19639c81bcfb2aee0749d3f7a87..92fecc3dc3d242a467cf0247e08e0b0d479d3c84 100755 (executable)
--- a/regress/tests/debug-test
+++ b/regress/tests/debug-test
@@ -14,7 +14,7 @@ rm -f ${cwd}/working/*trace*
 start_test
 
 cat <<END_OF_DATA >${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 0d005e56b7f0a21d970504406586f00152e9288f..838d5d1028b02323c2480e14d602f63ffb498b55 100755 (executable)
--- 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 <<END_OF_DATA >${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 4d95637a5898d786f25c73a3ac39e3cf63a17f0e..0a8ee55ad9ec39d08656ef02e9e01d2adfafd81a 100755 (executable)
--- 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 6d6aaa09e7a9fe12a75c001c82e90119d1b4e7a5..560fad68f5b493467c858d27a3a5268e0ac570dc 100755 (executable)
--- a/regress/tests/eighty-simultaneous-jobs-tape
+++ b/regress/tests/eighty-simultaneous-jobs-tape
@@ -17,7 +17,7 @@ change_jobname $JobName
 start_test
 
 cat <<END_OF_DATA >${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 93f2b2ef3502a4128ffddde955ab38badfbb0683..2a5b47f794ce1a978bc0decfe755d6fed94e2415 100755 (executable)
--- 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 4113ccf3f28843cf735e26ccae2ee81221827108..3ba6d725d321c8eb89131fe0895e9f98a5519a1c 100755 (executable)
--- 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 <<END_OF_DATA >${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 5a57c42350469daa97670d8ced79b7cb1cc2c6b7..0b9865e4dd1b797f99060423bce8ba296de2e00e 100755 (executable)
--- 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 <<END_OF_DATA >${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 ce794a72a1b09e4c69dc7c59abdce30877af10e7..376230abfa06446b06f32ecbf23a524806d8681b 100755 (executable)
--- 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 <<END_OF_DATA >$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 <<END_OF_DATA >$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 <<END_OF_DATA >$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 <<END_OF_DATA >$tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out $tmp/log5.out
 reload
@@ -90,7 +89,7 @@ END_OF_DATA
 run_bconsole
 
 cat <<END_OF_DATA >$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 50a45f2cbf719fccbeb5e5b73b76118204add51a..9ba0b1105ca9e4ff704ddbcdcb717b05fb0bb150 100755 (executable)
--- 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 <<END_OF_DATA >${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 dc9101a3ae839aa4c5c0391ab2eb5f8e3f5cd380..545e9bf7e26fc39897097b4f7ba9562f26382dbc 100755 (executable)
--- 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 <<END_OF_DATA >${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 c0dcd4232fada43e36827570ce5e7733289954c3..dffdf677978b07327667ff49bea850c8d9b5fc30 100755 (executable)
--- 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 11e8f141aabc7888e843ad2ae1163a67a9f0bc38..caf15fa89dabf5de9ed066c010b823f043ab0676 100755 (executable)
--- a/regress/tests/fileregexp-test
+++ b/regress/tests/fileregexp-test
@@ -24,7 +24,7 @@ change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${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 7ba4d453b84e6fcefe1fdccdb727b52ee22d56be..bc5eba1f78240a5d4485df82f50fb6aa2280d49e 100755 (executable)
--- 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 8fc617f24cfbef8a7f163555e15c959a8cd492ed..64471f38053ea0fc709e5c75801a1d7aa46dc2bc 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -17,7 +17,7 @@ change_jobname $JobName
 start_test
 
 cat <<END_OF_DATA >${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 fbcdf23d5c16e0299a055b267986fbc923df0f3e..8d93599352d1b0b4aae27da397af6bf238ceb44d 100755 (executable)
--- 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 <<END_OF_DATA >${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 e3505277da6ffcc3dae342cc3d765a1b9b35ca22..6ccb740636b9beb6f3734cd366ef71b9b12a58eb 100755 (executable)
--- 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 b13a3ddd930e20ecbcdea2a35625640d1eb22ca3..1a56a8703727a50bd3c5ed2439ae239d4fd805d5 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -16,7 +16,7 @@ change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 f3b560af07c878d473ac1bdfb02a3467be3d6082..b7b9d1c8ce335d1914113cb4e2f6ae2e514be144 100755 (executable)
--- a/regress/tests/gigaslam-sparse-test
+++ b/regress/tests/gigaslam-sparse-test
@@ -22,7 +22,7 @@ cd ${cwd}
 start_test
 
 cat >${cwd}/tmp/bconcmds <<END_OF_DATA
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
@@ -41,7 +41,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 

diff --git a/regress/tests/hardlink-test b/regress/tests/hardlink-test
index f556f889d453015a455c2b0ebae25dea2bd5fb47..33d6329d98238251a9a8f209ff6d133e66c7cf39 100755 (executable)
--- a/regress/tests/hardlink-test
+++ b/regress/tests/hardlink-test
@@ -51,7 +51,6 @@ done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 

diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 48b36ce7217ac2b147b82dea22683b09f81b5cea..377ca6776bf91766d6a7508b06ff2861f775fd77 100755 (executable)
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -65,7 +65,6 @@ restore where=${cwd}/tmp/bacula-restores
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index ba7a5373eb30bac4c1d6f39089742b85885ade7b..91adeb930f3ba995db1da271bdba4f728661e8d6 100755 (executable)
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -62,7 +62,6 @@ yes
 wait
 status storage=DDS-4
 messages
-@$out
 quit
 END_OF_DATA
 

diff --git a/regress/tests/incremental-2media-tape b/regress/tests/incremental-2media-tape
index 054ac7f771abf0ebcacd7cd7839028b0c4b780c3..70917209b3c40b77e0ee0615b493e1a9df2f5abb 100755 (executable)
--- a/regress/tests/incremental-2media-tape
+++ b/regress/tests/incremental-2media-tape
@@ -76,7 +76,6 @@ restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 

diff --git a/regress/tests/incremental-changer b/regress/tests/incremental-changer
index 650b52a0e71079bc28307a8f34e189a5c60fd4f7..62c650da8833b2ef8844ce58803b815514f8c313 100755 (executable)
--- a/regress/tests/incremental-changer
+++ b/regress/tests/incremental-changer
@@ -66,7 +66,6 @@ restore where=${cwd}/tmp/bacula-restores
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 38e8347b681fdff93f302c9859368cae22a5936e..cfc7423c4d9c913f4c1cfaf97ece25750d136844 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -26,7 +26,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 91753ce95ffa87e1406fc66155d9454ac97807b8..b7dca5200050f745cad4e73eca595b3f446dd0c0 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -21,7 +21,7 @@ change_jobname CompressedTest $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
@@ -45,7 +45,7 @@ echo "ficheriro1.txt" >${tmpsrc}/ficheriro1.txt
 cp -f ${tmpsrc}/dird.c ${tmpsrc}/ficheriro2.txt
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 9044d1c088c7968967fe6d4373d6941834c249bd..0ee005adc994b61ab329d0ca76820af3d2e39e15 100755 (executable)
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -16,9 +16,9 @@ echo " "
 echo " "
 
 cat <<END_OF_DATA > >${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 54da62c7d459c72119abcf6d8e2afbb9c562b47b..48067b2557f151b423d03d234ae4963145ef381f 100755 (executable)
--- 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 <<END_OF_DATA >${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 3dbcaaeaa336f6b77e06077cb93e52f43bcbf7cc..1b8a155289ad3509f4b8fbe2ceca4d63c72fd74a 100755 (executable)
--- 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 a671c0b3d20c2b3ab3f55882147e60f936869790..0b33c7813f7d497c0eec9a6ed4bbae5f7aed50c0 100755 (executable)
--- a/regress/tests/maxvol-test
+++ b/regress/tests/maxvol-test
@@ -21,7 +21,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 7fe6c2befee6ed51abf9d830063ae0b864e4e8a5..1bb3bcd6f9ea971df9d53c9f014b815825a1ccae 100755 (executable)
--- a/regress/tests/maxvol2-test
+++ b/regress/tests/maxvol2-test
@@ -17,7 +17,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 15f5c8915818cc77fd99590dd1dab2e3d8f96b05..a8379ceedf5c2d34c9ff8f9df682de7088274009 100755 (executable)
--- a/regress/tests/memory-bug-tape
+++ b/regress/tests/memory-bug-tape
@@ -20,7 +20,7 @@ change_jobname $JobName
 start_test
 
 cat <<END_OF_DATA >${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 1115ef09104bdd2132cc52d75bca125c92fc7289..16ca0e363c2820d075cea0f66ddc98cbb8d814c9 100755 (executable)
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -26,7 +26,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 6fadb3a10787de61e1ab85d5c412ab3ace8a21be..b0024a1fc2de32987831b4cf9fef459f2dcca398 100755 (executable)
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -31,7 +31,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 21a0d48ecc0def2ab10ffb328dba13d60c141ca0..fa2b53011a0faca60025eddbde74a81a42791916 100755 (executable)
--- a/regress/tests/migration-occupancy-test
+++ b/regress/tests/migration-occupancy-test
@@ -26,7 +26,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 c88613390071b2c99b54d8cf7a4c2b58c28f5585..3181e6d586280c5234f1e1ff2d3817ecfaab7e53 100755 (executable)
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -26,7 +26,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 13f7e67196fcd9409a06f844de3c7f5bb0f03797..dc951eaeb61c22ad3b2e397e8578b33f9bf81230 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -28,7 +28,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 fb61105d19e927bf545e21abdef9dcbd70998612..d0884cb13d560d344429c1e78516f70dfc33dffa 100755 (executable)
--- a/regress/tests/multi-client-test
+++ b/regress/tests/multi-client-test
@@ -17,7 +17,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 048dee3fb2de390ebf27b9fc2e52cbc0b19caa0a..9bf0b4dc9c47f988ec2ef5afa3bd56fef9dc8e66 100755 (executable)
--- 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 a7aa70538e36ea080580b02f00ca964efdc49de5..00e7d2d53d287d5ac6b6b3c8c9a6abe68bd2ffa1 100755 (executable)
--- a/regress/tests/plugin-test
+++ b/regress/tests/plugin-test
@@ -15,7 +15,7 @@ echo "${cwd}/README" >${cwd}/tmp/file-list
 start_test
 
 cat <<END_OF_DATA >${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 a4d365e1fe5e9a9046fba14d3eb159d92ac569af..1e0730960c3e4d39cfd9a2a1b48a225745d97d4e 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -22,7 +22,7 @@ change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 701a0083e78fd0f5b7fad47cba4d2c7ac07981e9..467d959052a42eb4457c7e8c4823f5ff0066a30f 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -22,7 +22,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 ac5a8e6db4f3e5d8a269abcd486f3760319b1a11..80e0f09e23e7aeff5322c2ef085472b2ba370116 100755 (executable)
--- a/regress/tests/relabel-tape
+++ b/regress/tests/relabel-tape
@@ -19,7 +19,7 @@ change_jobname $JobName
 start_test
 
 cat <<END_OF_DATA >${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 060a43e73aed41c3857efd94bd451e52cefc8d5c..990c2b8c0b42a8ca737ae12438f47ac70af916b4 100755 (executable)
--- 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 <<END_OF_DATA >${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 <<END_OF_DATA >${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 04b448d82dfcbd529334bca2d8a9725e43c8aefe..a01c409a25bd305378bc480a8e899d44ac4f03f8 100755 (executable)
--- 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 <<END_OF_DATA >${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 38fc0f7b7ba781e30fbb43bcb2b19df6d93c1256..3f6db5d143338c8a546ed25d3a9a0a9f16dd6f59 100755 (executable)
--- 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 041c278debe474065e11b3635e8d4727f3500a03..deb06ff7d60982f73a1b175185a98e396c56a3c1 100755 (executable)
--- 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 1a4553ab14693a0ecfe2edefd1afee0e35260934..7b3c2ecee0db46ff910c5d3e4fbf2bbe26367547 100755 (executable)
--- 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 <<END_OF_DATA >${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 11016ff4edc50f9dcb71354f5e55861a30751768..d73e1e07e5085fa14ba6dd97c7f979be6ee136c3 100755 (executable)
--- 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 dc019ca3cc529348918c1c8615ca2f27bc8d0144..814f6eef64d63b8b854715bc7a5dd265685b1327 100755 (executable)
--- 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 bebf0dd61b286c8688f8fa615d114a5885b2c161..3bc11d26077c7e877e496bf0b610b08764836418 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -27,7 +27,7 @@ change_jobname MultiVol $JobName
 start_test
 
 cat <<END_OF_DATA >${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 7000b0de9f64d740dd41543b158bdd78acb0bddd..dc0dc89561aee3549bec3579377ca5cac9c82d9e 100755 (executable)
--- 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 <<END_OF_DATA >${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 3e7a9d44c054cd4ea6c79eacae0c0420e09463a1..1120d3ca8cd1a744b9b44cb1487eae8f688acb95 100755 (executable)
--- a/regress/tests/source-addr-test
+++ b/regress/tests/source-addr-test
@@ -57,7 +57,7 @@ change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${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 <<END_OF_DATA >${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 d687c7d5268bc038e87f1540848371dbdfbbca77..4f3cdd8ab9020f99af9d5a1278f70d3a961ffa32 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -17,7 +17,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 47e05e41c179819678fc5702212ba79406e3c5ff..8226371a135810066dc352d44e111829efb2687a 100755 (executable)
--- 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 <<END_OF_DATA
-@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 select all storage=File done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 

diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index 865b739b49da841a6ab528cf4605870b4641a377..2dc79f41878c83fd9aa0d7d586369b2bdc550592 100755 (executable)
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -43,7 +43,6 @@ done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 38d12fd9989e4d83a5e96944376fcaad79274eb0..e6343c8e4750f9bb1eee414a7e65978090c005d8 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -14,7 +14,7 @@ echo "${cwd}/build" >${cwd}/tmp/file-list
 start_test
 
 cat >${cwd}/tmp/bconcmds <<END_OF_DATA
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
@@ -32,7 +32,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 

diff --git a/regress/tests/stats-test b/regress/tests/stats-test
index 4ee94cf86f1962bd43a5b885a2965f54a777643d..30db3c7d10ed605ea5f81b9d335c1245945caa12 100755 (executable)
--- a/regress/tests/stats-test
+++ b/regress/tests/stats-test
@@ -23,7 +23,7 @@ change_jobname BackupClient1 $JobName
 start_test
 
 cat <<END_OF_DATA >${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 d29837235bc0554f2ae72f540270a146962869ac..253cfbdc3fda174382cd3992f1a467715c64d6b5 100755 (executable)
--- 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 0069935c67f6ad32230af19ee5b7771fd5a9dfdb..657c37320129f912c577a753bb052699ecc1094f 100755 (executable)
--- 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 <<END_OF_DATA >${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 2eaf7d0c48b17ab4ac93b35fc40eccb11aacd6cf..7a86a9d0d478861dd5d5f5d469a63ed827749366 100755 (executable)
--- 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 <<END_OF_DATA >${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 10fadd2be6591bc0046e141fe01d08a04bf2938c..bded674a21afd70522e50eb7247cf0b757a56ed4 100755 (executable)
--- a/regress/tests/tls-authenticate-test
+++ b/regress/tests/tls-authenticate-test
@@ -15,7 +15,7 @@ change_jobname CompressedTest $JobName
 start_test
       
 cat <<END_OF_DATA >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 8e8899408edae6276bb2949b719d4370231566f2..f390f2ce579db01d82ea07691a962f0c2a60fbd1 100755 (executable)
--- a/regress/tests/tls-test
+++ b/regress/tests/tls-test
@@ -15,7 +15,6 @@ change_jobname CompressedTest $JobName
 start_test
       
 cat <<END_OF_DATA >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 c1a12d481e9792115d44c68372ae0a03924262d9..382692cacf339d73b1b8fbc74c6c70300cc8087a 100755 (executable)
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -17,7 +17,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >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 <<END_OF_DATA >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 <<END_OF_DATA >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 b8f8e8f87fc80f7b3175c11acf5e7d894fbe81be..ef88177e9add359de3168f0eee6656eeba4d119c 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -17,9 +17,9 @@ start_test
 
 cat >tmp/bconcmds <<END_OF_DATA
 setdebug level=150  storage=File
-@output /dev/null
+@$out /dev/null
 messages
-@output/dev/null
+@$out/dev/null
 estimate job=$JobName listing
 estimate job=$JobName
 estimate job=$JobName
@@ -41,7 +41,7 @@ touch ${cwd}/build/src/dird/*.c
 # run a second job
 #
 cat >tmp/bconcmds <<END_OF_DATA
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
 run job=$JobName
@@ -51,7 +51,7 @@ messages
 @# 
 @# now do several restores to ensure we cleanup between jobs
 @#
-@output /dev/null
+@$out /dev/null
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
@@ -66,7 +66,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 

diff --git a/regress/tests/two-pool-changer b/regress/tests/two-pool-changer
index 658075c93ad97d47d57660aa642468fa97b01c64..c48d66ff78cfe785baf2c07c95f38bb8ecac7709 100755 (executable)
--- a/regress/tests/two-pool-changer
+++ b/regress/tests/two-pool-changer
@@ -31,7 +31,7 @@ start_test
 
 # Write out bconsole commands to a file
 cat <<END_OF_DATA >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 b0a48ec6451344557540da4e85a9fb4f02b76fc3..bc154bc6fbeab8cd07c605fdb3219fdaafc03950 100755 (executable)
--- 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 <<END_OF_DATA >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 15f48ee5b24f32fd013182af366dee528707f12f..a6d84ee1f02c3440b2d769246850992567afd844 100755 (executable)
--- 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 8f3b5f8ebde20813944c69fc2bc4f19094f55cc5..49cbb036b40a1bdf69222543c300539b607e663b 100755 (executable)
--- 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 84a4228d3e4395a9d4c5bb8234b6ca31ec84149e..f14f999b26e22183606f65f0ad4e155986ca8098 100755 (executable)
--- 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 8d551aca6630e3002829815b4e385399c7bec270..b1e15726d2976c1ba404d8f8749cff0b8a981d41 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -16,9 +16,9 @@ echo " "
 echo " "
 
 cat <<END_OF_DATA > ${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 909dfedc3228e137ef50372e3407747d0930ecb6..eebd4b34ab26c6ec889547581af1981bdfe18591 100755 (executable)
--- 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 b1e79b98c72d202d3c9b78ee1d06a8d7e3b00ef8..261251511cb4d3df9aa5ed6d63f9e5b185c3746c 100755 (executable)
--- 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 c51228d8ea8957675324923c0a33a15ea2750462..36368e5dac899deeef4d26f943ca1627e5772392 100755 (executable)
--- 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 14447950d10c2f77cc1cd7ed223ebd62b659b6d9..99f758e5b12a3cf2d1de015616e7dce521a16281 100755 (executable)
--- 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 69f1fb69fd8f14ce05f654f777a361b47043001b..800ab152c1637240f549a092cca56d23173048cd 100755 (executable)
--- a/regress/tests/virtual-backup-test
+++ b/regress/tests/virtual-backup-test
@@ -26,7 +26,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 a2fa24b3f987d187e194649f8cbf9d567a76a43b..fd93c30c1a56d14f1f46b5ddfea6ec1acf1f53ca 100755 (executable)
--- a/regress/tests/virtual-backup2-test
+++ b/regress/tests/virtual-backup2-test
@@ -26,7 +26,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${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 7c06fcbfc94cca64ea43054b7a7826429ea83509..a937ddaab661362b7549f41eaaa15b0ee1fdcd64 100755 (executable)
--- 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 <<END_OF_DATA >${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 1ffda0fff1101bef3f523a3529208a438cf80e71..e7ff5e0ff9fe63608be9e3c5ce94b6b7a3e07fbe 100755 (executable)
--- a/regress/tests/vol-duration-changer
+++ b/regress/tests/vol-duration-changer
@@ -26,7 +26,7 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${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 e866200e18d67014c8818d710e5d7c65eab29dfa..b64335110b657f9faa8fcfb7f86648590f7a578b 100755 (executable)
--- 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 <<END_OF_DATA >${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 920ca7c60a8d822cc1aa87736df84559e7572ffe..bd211f0b1de277fb03cc9ddbfab20ce51e67be24 100755 (executable)
--- 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 9a8e1dce3b0964b587ec0b36f456efc6a5f4af84..9db7b5695e5b4318490ed8aaa4713c3aa7e58882 100755 (executable)
--- 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 4afd093536f032cde4f0888187ab43cc3fe00900..6b9b7c0626f1ab9bf6758267dfa35d69dbe31305 100755 (executable)
--- a/regress/tests/win32-backup-tape
+++ b/regress/tests/win32-backup-tape
@@ -19,7 +19,7 @@ change_jobname $JobName
 start_test
 
 cat <<END_OF_DATA >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 366a88e1d61e0291a1659d30b2b7c1522d393a60..1ba47eee2ef04e3a73b67bb745cd48efd1bf616e 100755 (executable)
--- a/regress/tests/win32-to-linux-tape
+++ b/regress/tests/win32-to-linux-tape
@@ -19,7 +19,7 @@ change_job $JobName
 start_test
 
 cat <<END_OF_DATA >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