From cdae8931ba557fe18fa330660b6e47a09c4e5b5a Mon Sep 17 00:00:00 2001 From: Dan Langille Date: Mon, 1 Oct 2007 00:28:27 +0000 Subject: [PATCH] Welcome to self-contained regression testing. You should now be able to run multiple regression test instances on the same machine without stepping on each others toes. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5704 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/Makefile | 3 +- regress/prototype.conf | 9 +++ regress/scripts/ansi-sd-tape.conf.in | 2 +- regress/scripts/bacula-dir-2d.conf.in | 14 ++--- regress/scripts/bacula-dir-fifo.conf.in | 14 ++--- regress/scripts/bacula-dir-migration.conf.in | 14 ++--- regress/scripts/bacula-dir-tape.conf.in | 16 ++--- regress/scripts/bacula-dir-win32-tape.conf.in | 8 +-- regress/scripts/bacula-dir.conf.errors.in | 20 +++---- regress/scripts/bacula-dir.conf.maxtime.in | 14 ++--- regress/scripts/bacula-dir.conf.regexwhere.in | 14 ++--- .../scripts/bacula-dir.conf.testrunscript.in | 14 ++--- regress/scripts/bacula-fd-2d.conf.in | 2 +- regress/scripts/bacula-sd-2d.conf.in | 2 +- regress/scripts/bacula-sd-2disk-drive.conf.in | 2 +- regress/scripts/bacula-sd-2disk.conf.in | 2 +- regress/scripts/bacula-sd-2drive.conf.in | 2 +- regress/scripts/bacula-sd-2tape.conf.in | 2 +- regress/scripts/bacula-sd-fifo.conf.in | 2 +- regress/scripts/bacula-sd-migration.conf.in | 2 +- regress/scripts/bacula-sd-tape.conf.in | 2 +- regress/scripts/bacula-sd.conf.in | 2 +- regress/scripts/bconsole-2d.conf.in | 2 +- regress/scripts/cleanup | 9 +-- regress/scripts/crypto-bacula-fd.conf.in | 2 +- regress/scripts/do_sed | 23 ++++--- .../scripts/multi-client-bacula-dir.conf.in | 18 +++--- regress/scripts/new-test-bacula-dir.conf.in | 28 ++++----- regress/scripts/regress-config | 1 + regress/scripts/test-bacula-dir.conf.in | 26 ++++---- regress/scripts/test-bacula-fd.conf.in | 2 +- regress/scripts/test-bacula-sd.conf.in | 2 +- regress/scripts/test-console.conf.in | 2 +- regress/scripts/testa-bacula-dir.conf.in | 12 ++-- regress/scripts/testb-bacula-dir.conf.in | 12 ++-- regress/scripts/tls-bacula-dir.conf.in | 28 ++++----- regress/scripts/tls-bacula-fd.conf.in | 2 +- regress/scripts/tls-bacula-sd.conf.in | 2 +- regress/scripts/win32-bacula-dir-tape.conf.in | 10 ++-- regress/tests/2drive-3pool-test | 10 ++-- regress/tests/2drive-concurrent-test | 8 +-- regress/tests/2drive-incremental-2disk | 18 +++--- regress/tests/2drive-incremental-2tape | 16 ++--- regress/tests/ansi-label-tape | 14 ++--- regress/tests/auto-label-test | 8 +-- regress/tests/backup-bacula-tape | 14 ++--- regress/tests/backup-bacula-test | 12 ++-- regress/tests/backup-to-null | 16 ++--- regress/tests/backup-win32-tape | 8 +-- regress/tests/bextract-test | 10 ++-- regress/tests/big-vol-test | 13 ++-- regress/tests/bscan-fast-tape | 2 +- regress/tests/bscan-tape | 8 +-- regress/tests/bscan-test | 4 +- regress/tests/bsr-opt-test | 10 ++-- regress/tests/btape-fill-full-tape | 4 +- regress/tests/btape-fill-tape | 6 +- regress/tests/bug-897 | 36 +++++------ regress/tests/bug-fatal-test | 14 ++--- regress/tests/compress-encrypt-test | 8 +-- regress/tests/compressed-test | 10 ++-- regress/tests/concurrent-jobs-test | 10 ++-- regress/tests/data-encrypt-test | 10 ++-- regress/tests/dev-test-root | 10 ++-- regress/tests/differential-test | 18 +++--- regress/tests/eighty-simultaneous-jobs-tape | 8 +-- regress/tests/encrypt-bug-test | 18 +++--- regress/tests/eot-fail-tape | 10 ++-- regress/tests/errors-test | 24 ++++---- regress/tests/etc-test-root | 10 ++-- regress/tests/fast-two-pool-test | 16 ++--- regress/tests/fifo-test | 20 +++---- regress/tests/fixed-block-size-tape | 8 +-- regress/tests/four-concurrent-jobs-tape | 8 +-- regress/tests/four-concurrent-jobs-test | 8 +-- regress/tests/four-jobs-tape | 38 ++++++------ regress/tests/four-jobs-test | 22 +++---- regress/tests/gigaslam-sparse-test | 8 +-- regress/tests/hardlink-test | 10 ++-- regress/tests/incremental-2disk | 20 +++---- regress/tests/incremental-2media | 12 ++-- regress/tests/incremental-2media-tape | 12 ++-- regress/tests/incremental-2tape | 22 +++---- regress/tests/incremental-tape | 14 ++--- regress/tests/incremental-test | 38 ++++++------ regress/tests/lib-tape-root | 8 +-- regress/tests/lib-test-root | 10 ++-- regress/tests/maxtime-test | 26 ++++---- regress/tests/maxvol-test | 8 +-- regress/tests/memory-bug-tape | 8 +-- regress/tests/migration-job-test | 8 +-- regress/tests/migration-jobspan-test | 8 +-- regress/tests/migration-occupancy-test | 8 +-- regress/tests/migration-time-test | 8 +-- regress/tests/migration-volume-test | 8 +-- regress/tests/multi-client-test | 6 +- regress/tests/query-test | 18 +++--- regress/tests/recycle-test | 8 +-- regress/tests/regexwhere-test | 12 ++-- regress/tests/relabel-tape | 10 ++-- regress/tests/restore-by-file-tape | 14 ++--- regress/tests/restore-by-file-test | 8 +-- regress/tests/restore-disk-seek-test | 8 +-- regress/tests/restore-seek-tape | 8 +-- regress/tests/restore2-by-file-test | 8 +-- regress/tests/runscript-test | 60 +++++++++---------- regress/tests/scratch-pool-test | 10 ++-- regress/tests/six-vol-test | 10 ++-- regress/tests/small-file-size-tape | 8 +-- regress/tests/span-vol-test | 8 +-- regress/tests/sparse-compressed-test | 8 +-- regress/tests/sparse-encrypt-test | 8 +-- regress/tests/sparse-test | 8 +-- regress/tests/three-pool-recycle-test | 10 ++-- regress/tests/three-pool-test | 12 ++-- regress/tests/tls-test | 2 +- regress/tests/truncate-bug-tape | 2 +- regress/tests/two-jobs-test | 2 +- regress/tests/two-pool-tape | 12 ++-- regress/tests/two-pool-test | 10 ++-- regress/tests/two-vol-test | 2 +- regress/tests/two-volume-tape | 2 +- regress/tests/two-volume-test | 2 +- regress/tests/usr-tape-root | 2 +- regress/tests/verify-cat-test | 8 +-- regress/tests/verify-vol-tape | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/weird-files-test | 4 +- regress/tests/weird-files2-test | 2 +- regress/tests/win32-backup-tape | 4 +- regress/tests/win32-to-linux-tape | 4 +- 131 files changed, 695 insertions(+), 675 deletions(-) diff --git a/regress/Makefile b/regress/Makefile index d33f78c0cf..c7e575c37c 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -49,7 +49,7 @@ root_test: clean: scripts/cleanup - rm -f /tmp/file-list + rm -f tmp/file-list rm -fr tmp/* working/* rm -f test.out rm -f diff @@ -60,7 +60,6 @@ clean: reset: chown -R ${USER}:${USER} . tmp working scripts/cleanup - rm -f /tmp/file-list tmp/file-list rm -f tmp/* working/* distclean: clean diff --git a/regress/prototype.conf b/regress/prototype.conf index 17053a9423..6fef8cb904 100644 --- a/regress/prototype.conf +++ b/regress/prototype.conf @@ -39,3 +39,12 @@ OPENSSL="--with-openssl" # You may put your real host name here, but localhost is valid also # and it has the advantage that it works on a non-newtworked machine HOST="localhost" + +# see --with-base-port at +# http://www.bacula.org/rel-manual/Installing_Bacula.html +# You only need to change this if you want to run more than one instance +# of regression testing on the same box. You'll need to set BASEPORT +# to values that do not overlap. BASEPORT is the first of three ports +# required by each instance, one for each of Dir, SD, and the FD. +# +BASEPORT=8101 diff --git a/regress/scripts/ansi-sd-tape.conf.in b/regress/scripts/ansi-sd-tape.conf.in index 598a8a4330..5993e12456 100644 --- a/regress/scripts/ansi-sd-tape.conf.in +++ b/regress/scripts/ansi-sd-tape.conf.in @@ -12,7 +12,7 @@ Storage { # definition of myself Name = @hostname@-sd - SDPort = 8103 # Director's port + SDPort = @sdport@ # Director's port WorkingDirectory = "@working_dir@" Pid Directory = "@piddir@" Subsys Directory = "@subsysdir@" diff --git a/regress/scripts/bacula-dir-2d.conf.in b/regress/scripts/bacula-dir-2d.conf.in index 2347532558..41f3b61443 100644 --- a/regress/scripts/bacula-dir-2d.conf.in +++ b/regress/scripts/bacula-dir-2d.conf.in @@ -13,7 +13,7 @@ Director { # define myself Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections + DIRPort = @dirport@ # where we listen for UA connections QueryFile = "@scriptdir@/query.sql" WorkingDirectory = "@working_dir@" PidDirectory = "@piddir@" @@ -24,7 +24,7 @@ Director { # define myself # # Define the main nightly save backup job -# By default, this job will back up to disk in /tmp +# By default, this job will back up to disk in @tmpdir@ Job { Name = "NightlySave" Type = Backup @@ -48,7 +48,7 @@ Job { Storage = DDS-4 Messages = Standard Pool = Default - Where = /tmp/bacula-restores + Where = @tmpdir@/bacula-restores } @@ -56,7 +56,7 @@ Job { FileSet { Name = "Full Set" Include { Options { signature=MD5 } - File = ${out} echo "s%@scriptdir@%${cwd}/bin%g" >>${out} @@ -30,6 +36,9 @@ echo "s%@hostname3_files@%${hostname3_files}%g" >>${out} echo "s%@hostname1_password@%${hostname1_password}%g" >>${out} echo "s%@hostname2_password@%${hostname2_password}%g" >>${out} echo "s%@hostname3_password@%${hostname3_password}%g" >>${out} +echo "s%@dirport@%${dirport}%g" >>${out} +echo "s%@sdport@%${sdport}%g" >>${out} +echo "s%@fdport@%${fdport}%g" >>${out} # process .in files with sed script sed -f ${out} ${cwd}/scripts/bacula-dir.conf.errors.in >${cwd}/scripts/bacula-dir.conf.errors @@ -72,12 +81,12 @@ sed -f ${out} ${cwd}/scripts/bacula-dir-2d.conf.in >${cwd}/scripts/bacula-dir-2d sed -f ${out} ${cwd}/scripts/bconsole-2d.conf.in >${cwd}/scripts/bconsole-2d.conf -cp ${cwd}/bin/bacula-sd.conf /tmp/bac$$ -sed s%/tmp%${cwd}/tmp%g /tmp/bac$$ >${cwd}/bin/bacula-sd.conf +cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/bac$$ +sed s%/tmp%${cwd}/tmp%g ${cwd}/tmp/bac$$ >${cwd}/bin/bacula-sd.conf chmod 777 ${cwd}/scripts/cleanup-*tape ${cwd}/scripts/cleanup-*drive ${cwd}/scripts/prepare-two-tapes -rm -f /tmp/bac$$ -cp ${cwd}/bin/mtx-changer /tmp/bac$$ -sed "s%^MTX.*$%MTX=${AUTOCHANGER_PATH}%g" /tmp/bac$$ >${cwd}/bin/mtx-changer +rm -f ${cwd}/tmp/bac$$ +cp ${cwd}/bin/mtx-changer ${cwd}/tmp/bac$$ +sed "s%^MTX.*$%MTX=${AUTOCHANGER_PATH}%g" ${cwd}/tmp/bac$$ >${cwd}/bin/mtx-changer chmod 777 ${cwd}/bin/mtx-changer # get proper SD tape definitions @@ -87,4 +96,4 @@ if test x`uname` = xFreeBSD ; then fi rm -f ${out} -rm -f /tmp/bac$$ +rm -f ${cwd}/tmp/bac$$ diff --git a/regress/scripts/multi-client-bacula-dir.conf.in b/regress/scripts/multi-client-bacula-dir.conf.in index fdd4f0a350..a8a2efec2e 100644 --- a/regress/scripts/multi-client-bacula-dir.conf.in +++ b/regress/scripts/multi-client-bacula-dir.conf.in @@ -14,7 +14,7 @@ Director { # define myself Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections + DIRPort = @dirport@ # where we listen for UA connections QueryFile = "@scriptdir@/query.sql" WorkingDirectory = "@working_dir@" PidDirectory = "@piddir@" @@ -26,7 +26,7 @@ Director { # define myself # # Define the main nightly save backup job -# By default, this job will back up to disk in /tmp +# By default, this job will back up to disk in @tmpdir@ Job { Name = "NightlySave" Type = Backup @@ -164,7 +164,7 @@ Job { Storage = File Messages = Standard Pool = Default - Where = /tmp/bacula-restores + Where = @tmpdir@/bacula-restores } @@ -200,7 +200,7 @@ FileSet { FileSet { Name = "SparseSet" Include { Options { signature=MD5; sparse=yes } - File=/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test @@ -28,10 +28,10 @@ start_test # sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out setdebug level=51 storage=DDS-4 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full drive=1 @@ -57,13 +57,13 @@ END_OF_DATA # exit run_bacula -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test index a24854d31f..c888a0c40e 100755 --- a/regress/tests/2drive-concurrent-test +++ b/regress/tests/2drive-concurrent-test @@ -12,15 +12,15 @@ JobName=Four-concurrent-jobs scripts/cleanup scripts/copy-2disk-drive-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label pool=Default storage=DDS-4 volume=TestVolume001 slot=1 drive=0 label pool=Default storage=DDS-4 volume=TestVolume002 slot=2 drive=1 update Volume=TestVolume001 MaxVolBytes=100000000 @@ -70,7 +70,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 unmark * mark * diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk index ea7f5c725b..353ff267fb 100755 --- a/regress/tests/2drive-incremental-2disk +++ b/regress/tests/2drive-incremental-2disk @@ -16,7 +16,7 @@ scripts/prepare-two-disks change_jobname localhost-fd $JobName start_test -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list if test ! -d ${cwd}/tmp/build ; then mkdir ${cwd}/tmp/build fi @@ -27,7 +27,7 @@ echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list cd ${cwd} # Turn off Prefer Mounted Volumes so we use 2 drives -outf="tmp/sed_tmp" +outf="${cwd}/tmp/sed_tmp" echo "s%# Prefer Mounted Volumes% Prefer Mounted Volumes%g" >${outf} cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 # Comment the next line out to write everything to one drive @@ -35,10 +35,10 @@ cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out setdebug level=3 dir setdebug level=3 storage=DDS-4 setdebug level=3 client @@ -65,10 +65,10 @@ run_bacula echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used status storage=DDS-4 @@ -81,7 +81,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores 7 <${cwd}/tmp/restore-list @@ -99,7 +99,7 @@ stop_bacula check_two_logs # The restore should read from TestVolume002, which was on drive 1 -grep TestVolume002 tmp/log2.out >/dev/null 2>&1 +grep TestVolume002 ${cwd}/tmp/log2.out >/dev/null 2>&1 # Note rstat may already be set, so we don't just store into it if [ $? != 0 ] ; then rstat=$? @@ -108,7 +108,7 @@ fi # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_restore_tmp_build_diff end_test diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape index 202ee92969..bdf03186a5 100755 --- a/regress/tests/2drive-incremental-2tape +++ b/regress/tests/2drive-incremental-2tape @@ -20,7 +20,7 @@ scripts/cleanup-2drive change_jobname localhost-fd $JobName -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list if test ! -d ${cwd}/tmp/build ; then mkdir ${cwd}/tmp/build fi @@ -31,7 +31,7 @@ echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list cd ${cwd} # Turn off Prefer Mounted Volumes so we use 2 drives -outf="tmp/sed_tmp" +outf="${cwd}/tmp/sed_tmp" echo "s%# Prefer Mounted Volumes% Prefer Mounted Volumes%g" >${outf} cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 # Comment the next line out to write everything to one drive @@ -41,10 +41,10 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 @#setdebug level=100 storage=DDS-4 @@ -68,10 +68,10 @@ run_bacula echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used status storage=DDS-4 @@ -84,7 +84,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores 7 <${cwd}/tmp/restore-list @@ -104,7 +104,7 @@ check_two_logs # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_restore_tmp_build_diff end_test diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape index e64ff19a04..17d83d8ccd 100755 --- a/regress/tests/ansi-label-tape +++ b/regress/tests/ansi-label-tape @@ -16,16 +16,16 @@ scripts/copy-tape-confs /bin/cp -f scripts/ansi-sd-tape.conf bin/bacula-sd.conf scripts/cleanup-tape -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=DDS-4 label storage=DDS-4 volume=Vol001 slot=0 pool=Default purge volume=Vol001 @@ -40,7 +40,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait @@ -58,10 +58,10 @@ stop_bacula touch ${cwd}/build/src/dird/*.c echo "test test" > ${cwd}/build/src/dird/xxx -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out list volumes @#setdebug level=300 storage=DDS-4 run job=$JobName yes @@ -71,7 +71,7 @@ messages @# @# now do a second restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out list volumes restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test index 4a952b4f95..0b85a90fa0 100755 --- a/regress/tests/auto-label-test +++ b/regress/tests/auto-label-test @@ -9,7 +9,7 @@ JobName=AutoLabel copy_test_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 sed "s%# Label Format% Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf @@ -17,10 +17,10 @@ sed "s%# Label Format% Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out status all status all list pools @@ -34,7 +34,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File unmark * mark * diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 5d578a2dcb..4c984d57f8 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -13,17 +13,17 @@ JobName=backuptape scripts/copy-tape-confs scripts/cleanup-tape -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=DDS-4 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default purge volume=TestVolume001 @@ -66,7 +66,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait @@ -84,10 +84,10 @@ stop_bacula touch ${cwd}/build/src/dird/*.c echo "test test" > ${cwd}/build/src/dird/xxx -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out list volumes run job=$JobName yes wait @@ -96,7 +96,7 @@ messages @# @# now do a second restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out list volumes restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index d61a8688ac..0815c38316 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -13,10 +13,10 @@ scripts/copy-confs change_jobname Client1 $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label volume=TestVolume001 storage=File pool=Default @#setdebug level=100 storage=File run job=$JobName yes @@ -43,7 +43,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all done yes wait @@ -56,10 +56,10 @@ run_bacula check_for_zombie_jobs storage=File stop_bacula -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=100 storage=File run job=$JobName yes wait @@ -67,7 +67,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all done yes wait diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null index 6acc65bc59..a8b2af2f39 100755 --- a/regress/tests/backup-to-null +++ b/regress/tests/backup-to-null @@ -13,18 +13,18 @@ JobName=backuptonull scripts/cleanup scripts/copy-fifo-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName -rm -f tmp/log1.out tmp/log2.out +rm -f ${cwd}/tmp/log1.out ${cwd}/tmp/log2.out start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=Dummy label storage=Dummy volume=TestVolume001 slot=0 pool=Default run job=$JobName yes @@ -46,10 +46,10 @@ stop_bacula touch ${cwd}/build/src/dird/*.c echo "test test" > ${cwd}/build/src/dird/xxx -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out list volumes run job=$JobName yes wait @@ -63,9 +63,9 @@ run_bacula check_for_zombie_jobs storage=Dummy stop_bacula -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null +grep "^ Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null bstat=$? -grep "^ Termination: *Backup OK" tmp/log2.out 2>&1 >/dev/null +grep "^ Termination: *Backup OK" ${cwd}/tmp/log2.out 2>&1 >/dev/null dstat=$? # not yet implemented diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape index e8ed6b7e85..2c67ddce85 100755 --- a/regress/tests/backup-win32-tape +++ b/regress/tests/backup-win32-tape @@ -11,16 +11,16 @@ JobName=backupwintape scripts/cleanup-tape scripts/copy-win32-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave yes @sleep 10 @@ -32,7 +32,7 @@ messages @# @# now do a restore @# -@$outt tmp/log2.out +@$outt ${cwd}/tmp/log2.out @#restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done @#yes @#wait diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 89ffcbd28a..80085b3265 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -10,15 +10,15 @@ JobName="bextract" scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 label storage=File1 volume=TestVolume002 update Volume=TestVolume001 MaxVolBytes=3000000 @@ -30,7 +30,7 @@ messages @# @# now build the bsr file but do not restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done no wait @@ -50,7 +50,7 @@ else bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null fi rstat=$? -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null +grep "^ Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null bstat=$? check_restore_diff end_test diff --git a/regress/tests/big-vol-test b/regress/tests/big-vol-test index 86ba521b96..21e4167737 100755 --- a/regress/tests/big-vol-test +++ b/regress/tests/big-vol-test @@ -10,15 +10,16 @@ JobName=bigvol scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +cwd=`pwd` +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=100 storage=File label storage=File volume=TestVolume001 run job=$JobName yes @@ -43,10 +44,10 @@ if [ $? != 0 ]; then fi cd ${cwd} -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out sql UPDATE Media SET Volbytes=${size} WHERE VolumeName='TestVolume001'; @@ -61,7 +62,7 @@ messages sql SELECT * FROM JobMedia; -@output tmp/log2.out +@output ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File select all done yes wait diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape index 0040ede662..7e2b38e329 100755 --- a/regress/tests/bscan-fast-tape +++ b/regress/tests/bscan-fast-tape @@ -11,7 +11,7 @@ JobName=bscantape copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 # sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 644db627a2..cfca352c91 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -11,10 +11,10 @@ JobName=bscantape copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >tmp/file-list -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf +cp ${cwd}/bin/bacula-sd.conf tmp/1 +sed "s%# Maximum File Size% Maximum File Size%" tmp/1 >${cwd}/bin/bacula-sd.conf change_jobname NightlySave $JobName start_test @@ -127,7 +127,7 @@ messages @# @# now do a restore @# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done +restore where=tmp/bacula-restores select all storage=DDS-4 done yes wait messages diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index a1c34c885d..fd71ef336d 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -12,7 +12,7 @@ JobName=bscan scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >tmp/file-list change_jobname NightlySave $JobName start_test @@ -71,7 +71,7 @@ messages @# now do a restore @# @#setdebug level=400 storage=File1 -restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done +restore bootstrap=tmp/kern.bsr where=tmp/bacula-restores select all storage=File1 done yes wait messages diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 677d45d8da..9413a8c081 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -12,15 +12,15 @@ JobName=bsr-opt scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 label storage=File1 volume=TestVolume002 update Volume=TestVolume001 MaxVolBytes=3000000 @@ -30,7 +30,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1 unmark * cd ${cwd}/build/src/cats @@ -56,7 +56,7 @@ grep TestVolume002 working/restore.bsr 2>&1 >/dev/null bsrstat=$? check_two_logs -diff -r build/src/cats tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null +diff -r build/src/cats ${cwd}/tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/btape-fill-full-tape b/regress/tests/btape-fill-full-tape index b2fc446ad1..7c32d04cda 100755 --- a/regress/tests/btape-fill-full-tape +++ b/regress/tests/btape-fill-full-tape @@ -12,7 +12,7 @@ scripts/cleanup-tape change_jobname $JobName start_test -bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out +bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >${cwd}/tmp/log1.out fill s @@ -20,7 +20,7 @@ quit END_OF_DATA -grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null +grep "^The last block on the tape matches\. Test succeeded\." ${cwd}/tmp/log1.out 2>&1 >/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape index 65661d5ffa..bca41b964d 100755 --- a/regress/tests/btape-fill-tape +++ b/regress/tests/btape-fill-tape @@ -8,14 +8,14 @@ JobName=filltape copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed "s%# MaximumVolumeSize% MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds fill s quit @@ -23,7 +23,7 @@ END_OF_DATA run_btape DDS-4 -grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null +grep "^The last block on the tape matches\. Test succeeded\." ${cwd}/tmp/log1.out 2>&1 >/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/bug-897 b/regress/tests/bug-897 index 762e0fc76e..67d0c2f2bb 100755 --- a/regress/tests/bug-897 +++ b/regress/tests/bug-897 @@ -10,15 +10,15 @@ JobName=backup copy_test_confs rm -f bin/bacula-dir.conf -rm -f tmp/RUN*log +rm -f ${cwd}/tmp/RUN*log rm -f ${cwd}/tmp/fifo -rm -f /tmp/RUN_BUG_897 -rm -f /tmp/RUN_FD_FAILED +rm -f ${cwd}/tmp/RUN_BUG_897 +rm -f ${cwd}/tmp/RUN_FD_FAILED /bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf -echo "${cwd}/build/po" >/tmp/file-list -echo "${cwd}/tmp/fifo" >> /tmp/file-list +echo "${cwd}/build/po" >${cwd}/tmp/file-list +echo "${cwd}/tmp/fifo" >> ${cwd}/tmp/file-list mkfifo "${cwd}/tmp/fifo" # use this to be able to cancel a running job @@ -29,16 +29,16 @@ mkfifo "${cwd}/tmp/fifo" start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages label volume=TestVolume001 -@$out tmp/RUN_FD_FAILED.log +@$out ${cwd}/tmp/RUN_FD_FAILED.log run job=RUN_FD_FAILED yes wait messages @sleep 1 -@$out tmp/RUN_BUG_897.log +@$out ${cwd}/tmp/RUN_BUG_897.log setdebug level=200 client run job=BUG_897 yes @sleep 2 @@ -61,15 +61,15 @@ export dstat export bstat export rstat -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 a=$? -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 b=$? -grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 c=$? -grep 'touching' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'touching' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 d=$? -grep '*** Backup Error ***' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 e=$? if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 ] then @@ -78,14 +78,14 @@ else echo "RUN_FD_FAILED in error" rstat=1 fi -if test -f /tmp/RUN_FD_FAILED +if test -f ${cwd}/tmp/RUN_FD_FAILED then - echo "The /tmp/RUN_FD_FAILED have been created, but nothing could be found" + echo "The ${cwd}/tmp/RUN_FD_FAILED have been created, but nothing could be found" echo "in the log" fi -grep 'touching' tmp/RUN_BUG_897.log >/dev/null 2>&1 +grep 'touching' ${cwd}/tmp/RUN_BUG_897.log >/dev/null 2>&1 d=$? if [ $d = 0 ] then @@ -94,9 +94,9 @@ else echo "RUN_BUG_897 in error" rstat=1 fi -if test -f /tmp/RUN_BUG_897 +if test -f ${cwd}/tmp/RUN_BUG_897 then - echo "The /tmp/RUN_BUG_897 have been created, but nothing could be found" + echo "The ${cwd}/tmp/RUN_BUG_897 have been created, but nothing could be found" echo "in the log" fi diff --git a/regress/tests/bug-fatal-test b/regress/tests/bug-fatal-test index 8e19473542..249858d6fb 100755 --- a/regress/tests/bug-fatal-test +++ b/regress/tests/bug-fatal-test @@ -11,20 +11,20 @@ JobName=backup copy_test_confs rm -f bin/bacula-dir.conf -rm -f tmp/RUN*log +rm -f ${cwd}/tmp/RUN*log /bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf -rm -f /tmp/file-list -# /tmp/file-list doesn't exists -# echo "${cwd}/build/po" >/tmp/file-list +rm -f ${cwd}/tmp/file-list +# ${cwd}/tmp/file-list doesn't exists +# echo "${cwd}/build/po" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages label volume=TestVolume001 -@$out tmp/RUN_BUG_FATAL.log +@$out ${cwd}/tmp/RUN_BUG_FATAL.log run job=BUG_FATAL yes wait messages @@ -35,7 +35,7 @@ END_OF_DATA bin/bacula start -cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf > /dev/null +cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf > /dev/null stop_bacula export dstat=0 diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test index 9b77d12abd..d4eb0cae52 100755 --- a/regress/tests/compress-encrypt-test +++ b/regress/tests/compress-encrypt-test @@ -9,14 +9,14 @@ JobName=CompressedTest scripts/cleanup scripts/copy-crypto-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 setdebug level=10 fd run job=$JobName yes @@ -26,7 +26,7 @@ list volumes @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out @# setdebug level=0 fd restore where=${cwd}/tmp/bacula-restores storage=File 5 diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 2cbe9087c3..47fc8e4362 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -9,15 +9,15 @@ JobName=compressed scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out status all status all messages @@ -28,7 +28,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File unmark * mark * @@ -46,7 +46,7 @@ stop_bacula check_two_logs check_restore_diff -grep " Software Compression" tmp/log1.out | grep "%" 2>&1 1>/dev/null +grep " Software Compression" ${cwd}/tmp/log1.out | grep "%" 2>&1 1>/dev/null if [ $? != 0 ] ; then echo " !!!!! No compression !!!!!" bstat=1 diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 80c30b24f2..37c69bd801 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -9,7 +9,7 @@ JobName=concurrent-jobs copy_test_confs -echo "${cwd}/tmp/largefile" >/tmp/file-list +echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list if test -c /dev/urandom ; then # Create 56MB file with random data echo "Creating a 56MB file with random data ..." @@ -30,10 +30,10 @@ echo "largefile created" change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=$JobName level=Full yes run job=$JobName level=Full yes @@ -44,7 +44,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File unmark * mark * @@ -61,6 +61,6 @@ check_for_zombie_jobs storage=File stop_bacula check_two_logs -diff tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null +diff ${cwd}/tmp/largefile ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null dstat=$? end_test diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test index 6239dd00b1..581b8a219c 100755 --- a/regress/tests/data-encrypt-test +++ b/regress/tests/data-encrypt-test @@ -10,15 +10,15 @@ JobName=Crypto scripts/cleanup scripts/copy-crypto-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 @#setdebug level=10 fd run job=$JobName yes @@ -27,7 +27,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out @#setdebug level=10 fd restore where=${cwd}/tmp/bacula-restores storage=File 5 @@ -46,7 +46,7 @@ check_for_zombie_jobs storage=File stop_bacula du -s build -du -s tmp/bacula-restores/ +du -s ${cwd}/tmp/bacula-restores/ check_two_logs check_restore_diff diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root index 66728d646b..0d005e56b7 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -11,14 +11,14 @@ require_root scripts/cleanup scripts/copy-test-confs -echo "/dev" >/tmp/file-list +echo "/dev" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@output tmp/log1.out +@output ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=NightlySave yes wait @@ -26,7 +26,7 @@ messages @# @# now do a restore @# -@output tmp/log2.out +@output ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all done yes wait @@ -65,7 +65,7 @@ sed -f sed.scr 1 | sort >restored rm -f sed.scr # cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/differential-test b/regress/tests/differential-test index 36205f422c..7ef57dc220 100755 --- a/regress/tests/differential-test +++ b/regress/tests/differential-test @@ -9,7 +9,7 @@ JobName=differential scripts/cleanup scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list mkdir ${cwd}/tmp/build cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build cd ${cwd}/tmp @@ -20,10 +20,10 @@ cd ${cwd} change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume002 label storage=File volume=TestVolume001 run job=$JobName yes @@ -38,10 +38,10 @@ scripts/check_for_zombie_jobs storage=File echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force differential on the second Volume update volume=TestVolume002 VolStatus=Used run level=differential job=$JobName yes @@ -55,17 +55,17 @@ run_bconsole scripts/check_for_zombie_jobs storage=File echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=incremental job=$JobName yes wait messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list yes wait @@ -82,6 +82,6 @@ check_two_logs # # Delete .c files because we will only restore the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_restore_tmp_build_diff end_test diff --git a/regress/tests/eighty-simultaneous-jobs-tape b/regress/tests/eighty-simultaneous-jobs-tape index 8125ab7308..3fe631fceb 100755 --- a/regress/tests/eighty-simultaneous-jobs-tape +++ b/regress/tests/eighty-simultaneous-jobs-tape @@ -9,15 +9,15 @@ JobName=EightySimultaneousJobs scripts/cleanup-tape scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full Storage=DDS-4 yes run job=$JobName level=Full Storage=DDS-4 yes @@ -110,7 +110,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 unmark * mark * diff --git a/regress/tests/encrypt-bug-test b/regress/tests/encrypt-bug-test index 235f14a6f2..93f2b2ef35 100755 --- a/regress/tests/encrypt-bug-test +++ b/regress/tests/encrypt-bug-test @@ -9,11 +9,11 @@ JobName=Crypto-bug scripts/cleanup scripts/copy-crypto-confs -echo "${cwd}/encrypt-bug.jpg" >/tmp/file-list -echo "${cwd}/encrypt-bug.jpg" >${cwd}/tmp/restore-list -echo "${cwd}/encrypt-bug.txt" >>/tmp/file-list -echo "${cwd}/encrypt-bug.txt" >>${cwd}/tmp/restore-list -echo "${cwd}/encrypt-bug2.txt" >>/tmp/file-list +echo "${cwd}/encrypt-bug.jpg" >${cwd}/tmp/file-list +echo "${cwd}/encrypt-bug.jpg" >${cwd}/tmp/restore-list +echo "${cwd}/encrypt-bug.txt" >>${cwd}/tmp/file-list +echo "${cwd}/encrypt-bug.txt" >>${cwd}/tmp/restore-list +echo "${cwd}/encrypt-bug2.txt" >>${cwd}/tmp/file-list echo "${cwd}/encrypt-bug2.txt" >>${cwd}/tmp/restore-list files="encrypt-bug.jpg encrypt-bug.txt encrypt-bug2.txt" mkdir -p ${cwd}/tmp/build @@ -24,10 +24,10 @@ done change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 setdebug level=100 fd run job=$JobName yes @@ -36,7 +36,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out setdebug level=100 fd restore where=${cwd}/tmp/bacula-restores storage=File 5 @@ -55,7 +55,7 @@ check_for_zombie_jobs storage=File stop_bacula du -s build -du -s tmp/bacula-restores/ +du -s ${cwd}/tmp/bacula-restores/ check_two_logs diff --git a/regress/tests/eot-fail-tape b/regress/tests/eot-fail-tape index dd9ee7c0a0..33bf4035b1 100755 --- a/regress/tests/eot-fail-tape +++ b/regress/tests/eot-fail-tape @@ -10,9 +10,9 @@ JobName=eotfailtape scripts/cleanup-tape scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list -out="tmp/sed_tmp" +out="${cwd}/tmp/sed_tmp" echo "s%# Maximum File Size% Maximum File Size%g" >${out} cp -f ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf @@ -20,10 +20,10 @@ sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default update Volume=TestVolume001 MaxVolBytes=3000000 run job=$JobName yes @@ -32,7 +32,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait diff --git a/regress/tests/errors-test b/regress/tests/errors-test index ca7e2bcd79..5bd40fcb49 100755 --- a/regress/tests/errors-test +++ b/regress/tests/errors-test @@ -11,16 +11,16 @@ JobName=backup scripts/cleanup copy_test_confs -rm -f tmp/*.log +rm -f ${cwd}/tmp/*.log /bin/cp -f scripts/bacula-dir.conf.errors bin/bacula-dir.conf -echo "${cwd}/build/po" >/tmp/file-list +echo "${cwd}/build/po" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@output tmp/LOCAL_INC_ERR.log +@output ${cwd}/tmp/LOCAL_INC_ERR.log label storage=File volume=TestVolume001 add storage=File2 1 @@ -29,31 +29,31 @@ File2 run job=LOCAL_INC_ERR yes wait messages -@output tmp/REMOTE_INC_ERR.log +@output ${cwd}/tmp/REMOTE_INC_ERR.log run job=REMOTE_INC_ERR yes wait messages -@output tmp/LOCAL_EXCL_ERR.log +@output ${cwd}/tmp/LOCAL_EXCL_ERR.log run job=LOCAL_EXCL_ERR yes wait messages -@$out tmp/REMOTE_EXCL_ERR.log +@$out ${cwd}/tmp/REMOTE_EXCL_ERR.log run job=REMOTE_EXCL_ERR yes wait messages -@$out tmp/REMOTE_RUNSCRIPT_ERR.log +@$out ${cwd}/tmp/REMOTE_RUNSCRIPT_ERR.log run job=REMOTE_RUNSCRIPT_ERR yes wait messages -@$out tmp/LOCAL_RUNSCRIPT_ERR.log +@$out ${cwd}/tmp/LOCAL_RUNSCRIPT_ERR.log run job=LOCAL_RUNSCRIPT_ERR yes wait messages -@$out tmp/CLIENT_CONNECT_TIMEOUT.log +@$out ${cwd}/tmp/CLIENT_CONNECT_TIMEOUT.log run job=CLIENT_CONNECT_TIMEOUT yes wait messages -@$out tmp/SD_CONNECT_TIMEOUT.log +@$out ${cwd}/tmp/SD_CONNECT_TIMEOUT.log run job=SD_CONNECT_TIMEOUT yes wait messages @@ -63,7 +63,7 @@ quit END_OF_DATA run_bacula -touch tmp/log1.out +touch ${cwd}/tmp/log1.out client=$(grep client= bin/bacula-dir.conf) check_for_zombie_jobs storage=File $client stop_bacula diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root index 2c5e24a1db..50a45f2cbf 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -8,14 +8,14 @@ TestName="etc-test-root" scripts/cleanup scripts/copy-test-confs -echo "/etc" >/tmp/file-list +echo "/etc" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@output tmp/log1.out +@output ${cwd}/tmp/log1.out label storage=File TestVolume001 run job=NightlySave @@ -25,7 +25,7 @@ messages @# @# now do a restore @# -@output tmp/log2.out +@output ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select unmark * mark * @@ -51,7 +51,7 @@ sort <${cwd}/tmp/1 >${cwd}/tmp/original sort <${cwd}/tmp/2 >${cwd}/tmp/restored rm -f ${cwd}/tmp/1 ${cwd}/tmp/2 cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test index 7bc19e6b77..51efc8b945 100755 --- a/regress/tests/fast-two-pool-test +++ b/regress/tests/fast-two-pool-test @@ -4,7 +4,7 @@ # an autochanger. Note, the Director has three Pools in its # conf: Default, Full, and Inc. Default is used in the # NightlySave job by default. What is backed up is what -# is in /tmp/file-list, which is by default the Bacula +# is in ${cwd}/tmp/file-list, which is by default the Bacula # source code (i.e. the build directory). # # Note, we use the virtual disk autochanger. @@ -19,18 +19,18 @@ scripts/prepare-two-disks # Make a relatively large backup set 5 x source code directory # Reduced to 1 for portable -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list start_test # Write out bconsole commands to a file -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=150 storage=DDS-4 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 @@ -51,7 +51,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test index dabe5c1a80..e994caeafc 100755 --- a/regress/tests/fifo-test +++ b/regress/tests/fifo-test @@ -8,20 +8,20 @@ JobName=FIFOTest scripts/cleanup scripts/copy-test-confs -echo "/tmp/bfifo" >/tmp/file-list +echo "${cwd}/tmp/bfifo" >${cwd}/tmp/file-list -rm -f /tmp/bfifo -mkfifo /tmp/bfifo +rm -f ${cwd}/tmp/bfifo +mkfifo ${cwd}/tmp/bfifo # send a file into the fifo file=encrypt-bug.jpg -cat ${file} >/tmp/bfifo& +cat ${file} >${cwd}/tmp/bfifo& start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 run job=$JobName storage=File1 yes wait @@ -32,13 +32,13 @@ END_OF_DATA run_bacula -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out @#setdebug level=50 client restore where=/ select all storage=File1 done yes @@ -48,7 +48,7 @@ messages quit END_OF_DATA -cat tmp/${file}& +cat <${cwd}/tmp/bfifo >${cwd}/tmp/${file}& run_bconsole @@ -56,6 +56,6 @@ check_for_zombie_jobs storage=File1 stop_bacula check_two_logs -diff ${file} tmp/${file} +diff ${file} ${cwd}/tmp/${file} dstat=$? end_test diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape index b26b241bc1..6799b543b2 100755 --- a/regress/tests/fixed-block-size-tape +++ b/regress/tests/fixed-block-size-tape @@ -10,7 +10,7 @@ JobName=fixedblocksize copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 echo "s%# Maximum Block Size% Maximum Block Size%" >${cwd}/tmp/2 @@ -29,10 +29,10 @@ change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out setdebug level=51 storage=DDS-4 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName yes @@ -41,7 +41,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 unmark * mark * diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 31f2dead5b..9461a217b9 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -9,15 +9,15 @@ JobName=FourConcurrentJobs scripts/cleanup-tape scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full Storage=DDS-4 yes run job=$JobName level=Full Storage=DDS-4 yes @@ -34,7 +34,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 unmark * mark * diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index fb7cf9702d..5190dfce6d 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -11,15 +11,15 @@ JobName=Four-concurrent-jobs scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 TestVolume001 label storage=File1 @@ -71,7 +71,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File1 unmark * mark * diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index e95b1b7617..6d07d53171 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -10,18 +10,18 @@ JobName=fourjobstape scripts/cleanup-tape scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null estimate job=$JobName listing estimate job=$JobName listing estimate job=$JobName listing messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName yes wait @@ -30,10 +30,10 @@ quit END_OF_DATA if test "$debug" -eq 1 ; then bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf else bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null fi scripts/check_for_zombie_jobs storage=DDS-4 @@ -45,10 +45,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # # run a second job # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName level=Incremental yes wait messages @@ -56,10 +56,10 @@ quit END_OF_DATA if test "$debug" -eq 1 ; then bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf else bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null fi scripts/check_for_zombie_jobs storage=DDS-4 @@ -69,10 +69,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # # run a third job # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName level=Incremental yes wait messages @@ -80,10 +80,10 @@ quit END_OF_DATA if test "$debug" -eq 1 ; then bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf else bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null fi scripts/check_for_zombie_jobs storage=DDS-4 @@ -93,10 +93,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # # run a fourth job # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName level=Incremental yes wait messages @@ -104,10 +104,10 @@ quit END_OF_DATA if test "$debug" -eq 1 ; then bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf else bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null fi scripts/check_for_zombie_jobs storage=DDS-4 @@ -115,7 +115,7 @@ echo "Backup 4 done" # # now do several restores to ensure we cleanup between jobs # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null restore where=${cwd}/tmp/bacula-restores select all done yes @@ -123,7 +123,7 @@ wait restore where=${cwd}/tmp/bacula-restores select all done yes wait -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out @# @# now unmount the tape and start two restores @# at the same time diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 046fc9a61e..9af909d8b8 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -10,18 +10,18 @@ JobName=SpanVol scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null estimate job=$JobName listing estimate job=$JobName listing estimate job=$JobName listing messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=$JobName yes wait @@ -39,10 +39,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # # run a second job # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName yes wait messages @@ -58,10 +58,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # # run a third job # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@output tmp/log1.out +@output ${cwd}/tmp/log1.out run job=$JobName yes wait messages @@ -77,10 +77,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o # # run a fourth job # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@output tmp/log1.out +@output ${cwd}/tmp/log1.out run job=$JobName yes wait messages @@ -94,7 +94,7 @@ echo "Backup 4 done" # # now do several restores to ensure we cleanup between jobs # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null restore where=${cwd}/tmp/bacula-restores select all storage=File done yes @@ -102,7 +102,7 @@ wait restore where=${cwd}/tmp/bacula-restores select all storage=File done yes wait -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File unmark * mark * diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test index 4e00043d24..f3b560af07 100755 --- a/regress/tests/gigaslam-sparse-test +++ b/regress/tests/gigaslam-sparse-test @@ -9,7 +9,7 @@ JobName=SparseTest scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cd ${cwd}/build/src/tools ./gigaslam if [ $? != 0 ]; then @@ -21,10 +21,10 @@ cd ${cwd} start_test -cat >tmp/bconcmds <${cwd}/tmp/bconcmds </tmp/file-list -echo "${cwd}/weird-files" >>/tmp/file-list +echo "${cwd}/weird-files" >${cwd}/tmp/file-list +echo "${cwd}/weird-files" >>${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File TestVolume001 run job=$JobName @@ -41,7 +41,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File 5 cd ${cwd}/weird-files/subdir diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk index 1064e7e198..63098bcd9b 100755 --- a/regress/tests/incremental-2disk +++ b/regress/tests/incremental-2disk @@ -20,7 +20,7 @@ cd .. scripts/copy-2disk-confs scripts/prepare-two-disks -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list if test ! -d ${cwd}/tmp/build ; then mkdir ${cwd}/tmp/build fi @@ -34,10 +34,10 @@ change_jobname $JobName start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 run job=$JobName yes @@ -52,10 +52,10 @@ echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used run level=Incremental job=$JobName yes @@ -64,7 +64,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores 7 <${cwd}/tmp/restore-list @@ -83,7 +83,7 @@ stop_bacula # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_two_logs check_restore_tmp_build_diff @@ -94,11 +94,11 @@ check_restore_tmp_build_diff # an error. # if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then - cat tmp/log1.out + cat ${cwd}/tmp/log1.out echo " " - cat tmp/log2.out + cat ${cwd}/tmp/log2.out echo " " - diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build + diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build fi end_test diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media index c8624c1e17..902f1df5a0 100755 --- a/regress/tests/incremental-2media +++ b/regress/tests/incremental-2media @@ -14,16 +14,16 @@ JobName=Inc2media scripts/cleanup scripts/copy-2disk-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=File volume=TestVolume002 Pool=Default run job=$JobName yes @@ -39,10 +39,10 @@ echo "Backup 1 done" touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used setdebug level=51 storage=File @@ -52,7 +52,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out setdebug level=51 storage=DDS-4 restore where=${cwd}/tmp/bacula-restores select all done yes diff --git a/regress/tests/incremental-2media-tape b/regress/tests/incremental-2media-tape index 3bfe5c5251..65014880f8 100755 --- a/regress/tests/incremental-2media-tape +++ b/regress/tests/incremental-2media-tape @@ -29,16 +29,16 @@ mt -f /dev/nst0 weof mt -f /dev/nst1 rewind mt -f /dev/nst1 weof -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DLT80 volume=TestVolume002 Pool=Default run job=$JobName yes @@ -54,10 +54,10 @@ echo "Backup 1 done" touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used setdebug level=51 storage=DLT80 @@ -68,7 +68,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out setdebug level=51 storage=DDS-4 restore where=${cwd}/tmp/bacula-restores select all done yes diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape index 35b2621c7a..67d4211a20 100755 --- a/regress/tests/incremental-2tape +++ b/regress/tests/incremental-2tape @@ -26,7 +26,7 @@ cd .. scripts/copy-2tape-confs scripts/cleanup-2tape -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list if test ! -d ${cwd}/tmp/build ; then mkdir ${cwd}/tmp/build fi @@ -43,10 +43,10 @@ echo " === Starting incremental-2tape test ===" >>working/log echo " " # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 run job=NightlySave yes @@ -57,17 +57,17 @@ END_OF_DATA if test "$debug" -eq 1 ; then bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf else bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null + cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null fi echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null +grep "^ Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null bstat=$? -grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null +grep "^ Termination: *Restore OK" ${cwd}/tmp/log2.out 2>&1 >/dev/null rstat=$? # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c -diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null +rm -f ${cwd}/tmp/build/*.c +diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 2c5fd6d3a9..bd9141e19d 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -9,7 +9,7 @@ JobName=IncTape copy_tape_confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list if test ! -d ${cwd}/tmp/build ; then mkdir ${cwd}/tmp/build fi @@ -22,10 +22,10 @@ cd ${cwd} change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName yes wait @@ -39,17 +39,17 @@ check_for_zombie_jobs storage=DDS-4 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes wait messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=DDS-4 7 <${cwd}/tmp/restore-list @@ -68,7 +68,7 @@ stop_bacula # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_two_logs check_restore_tmp_build_diff diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 11ee94a6d9..a5149051f6 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -9,7 +9,7 @@ JobName=Incremental scripts/cleanup scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list mkdir ${cwd}/tmp/build cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build cd ${cwd}/tmp @@ -20,10 +20,10 @@ cd ${cwd} change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=100 storage=File label storage=File volume=TestVolume001 label storage=File volume=TestVolume002 @@ -42,10 +42,10 @@ sleep 1 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt cp -f ${cwd}/tmp/build/dird.c ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force Incremental on the second Volume update volume=TestVolume001 VolStatus=Used run level=Differential job=$JobName yes @@ -60,10 +60,10 @@ sleep 1 touch ${cwd}/tmp/build/ficheriro1.txt touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes wait messages @@ -78,10 +78,10 @@ cp -f ficheriro2.txt 1 sed "s%a%b%g" 1 >ficheriro2.txt rm -f 1 cd ${cwd} -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Differential job=$JobName yes wait messages @@ -93,10 +93,10 @@ run_bconsole sleep 1 touch ${cwd}/tmp/build/ficheriro1.txt touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes wait messages @@ -108,10 +108,10 @@ run_bconsole sleep 1 touch ${cwd}/tmp/build/ficheriro1.txt touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes wait messages @@ -123,10 +123,10 @@ run_bconsole sleep 1 touch ${cwd}/tmp/build/ficheriro1.txt touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes wait messages @@ -138,17 +138,17 @@ sleep 1 touch ${cwd}/tmp/build/ficheriro1.txt touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=Incremental job=$JobName yes wait messages @# @# now do a restore @# -@output tmp/log2.out +@output ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list yes wait @@ -165,6 +165,6 @@ check_two_logs # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_restore_tmp_build_diff end_test diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root index c0cec63d76..b02c15284f 100755 --- a/regress/tests/lib-tape-root +++ b/regress/tests/lib-tape-root @@ -14,7 +14,7 @@ cd .. scripts/cleanup-tape scripts/copy-tape-confs -echo "/lib" >/tmp/file-list +echo "/lib" >${cwd}/tmp/file-list echo " " echo " " echo " === Starting lib-tape-root test ===" @@ -24,7 +24,7 @@ bin/bacula start 2>&1 >/dev/null bin/bconsole -c bin/bconsole.conf <restored rm -f 1 # cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/nul if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root index d50a5e067f..54da62c7d4 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -11,14 +11,14 @@ require_root scripts/cleanup scripts/copy-test-confs -echo "/lib" >/tmp/file-list +echo "/lib" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@output tmp/log1.out +@output ${cwd}/tmp/log1.out label storage=File TestVolume001 run job=NightlySave @@ -28,7 +28,7 @@ messages @# @# now do a restore @# -@output tmp/log2.out +@output ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select unmark * mark * @@ -59,7 +59,7 @@ sort <1 >restored rm -f 1 # cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test index ea69fb26fd..0452a867c4 100755 --- a/regress/tests/maxtime-test +++ b/regress/tests/maxtime-test @@ -11,19 +11,19 @@ JobName=backup copy_test_confs rm -f bin/bacula-dir.conf -rm -f tmp/RUN*log +rm -f ${cwd}/tmp/RUN*log /bin/cp -f scripts/bacula-dir.conf.maxtime bin/bacula-dir.conf WHEN=$(date '+%Y-%m-%d %H:%M:%S') -echo "${cwd}/build/po" >/tmp/file-list +echo "${cwd}/build/po" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages label volume=TestVolume001 pool=PoolA -@$out tmp/RUN_MAXTIME.log +@$out ${cwd}/tmp/RUN_MAXTIME.log @# no media => have to wait run job=RUN_MAXWAITTIME pool=Default yes @sleep 2 @@ -38,21 +38,21 @@ st dir quit END_OF_DATA -(mkfifo /tmp/fifo - mkfifo /tmp/fifo2 - mkfifo /tmp/fifo3) 2> /dev/null +(mkfifo ${cwd}/tmp/fifo + mkfifo ${cwd}/tmp/fifo2 + mkfifo ${cwd}/tmp/fifo3) 2> /dev/null bin/bacula start -cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf > /dev/null +cat ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf > /dev/null stop_bacula -rm /tmp/fifo /tmp/fifo2 /tmp/fifo3 +rm ${cwd}/tmp/fifo ${cwd}/tmp/fifo2 ${cwd}/tmp/fifo3 export dstat=0 export bstat=0 export rstat=0 -if grep -e 'RUN_MAXWAITTIME.* Fatal error: Max wait time exceeded. Job canceled.' tmp/RUN_MAXTIME.log >/dev/null 2>&1 +if grep -e 'RUN_MAXWAITTIME.* Fatal error: Max wait time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null 2>&1 then [ "$debug" = 1 ] && echo MAXWAITTIME ok else @@ -60,8 +60,8 @@ else rstat=1 fi -if grep -e 'RUN_MAXSTARTDELAY.* Fatal error: Job canceled because max start delay time exceeded.' tmp/RUN_MAXTIME.log && - ! grep -e 'NEVER start this' tmp/RUN_MAXTIME.log >/dev/null 2>&1 +if grep -e 'RUN_MAXSTARTDELAY.* Fatal error: Job canceled because max start delay time exceeded.' ${cwd}/tmp/RUN_MAXTIME.log && + ! grep -e 'NEVER start this' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null 2>&1 then [ "$debug" = 1 ] && echo MAXSTARTDELAY ok else @@ -69,7 +69,7 @@ else rstat=1 fi -if grep -e 'RUN_MAXRUNTIME.* Fatal error: Max run time exceeded. Job canceled.' tmp/RUN_MAXTIME.log >/dev/null 2>&1 +if grep -e 'RUN_MAXRUNTIME.* Fatal error: Max run time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null 2>&1 then [ "$debug" = 1 ] && echo MAXRUNTIME ok else diff --git a/regress/tests/maxvol-test b/regress/tests/maxvol-test index 1620b989f2..e593d1d751 100755 --- a/regress/tests/maxvol-test +++ b/regress/tests/maxvol-test @@ -11,7 +11,7 @@ JobName=maxvol scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp -f ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 sed "s%# Maximum Volume Jobs% Maximum Volume Jobs%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf @@ -20,10 +20,10 @@ sed "s%# Maximum Volume Jobs% Maximum Volume Jobs%" ${cwd}/tmp/1 >${cwd}/bin/ba change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 label storage=File1 volume=TestVolume002 label storage=File1 volume=TestVolume003 @@ -41,7 +41,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File1 unmark * mark * diff --git a/regress/tests/memory-bug-tape b/regress/tests/memory-bug-tape index af3811ac1e..6ae57fed6e 100755 --- a/regress/tests/memory-bug-tape +++ b/regress/tests/memory-bug-tape @@ -12,15 +12,15 @@ JobName=FourConcurrentJobs scripts/cleanup-tape scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full Storage=DDS-4 yes sql @@ -20037,7 +20037,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 unmark * mark * diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test index 6de8ccb419..69cbe43dc3 100755 --- a/regress/tests/migration-job-test +++ b/regress/tests/migration-job-test @@ -13,7 +13,7 @@ JobName=MigrationJobSave scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test @@ -25,10 +25,10 @@ start_test # Pool Full uses Storage=DiskChanger # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=100 storage=File label storage=File volume=FileVolume001 Pool=Default label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 @@ -62,7 +62,7 @@ list jobs @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out list volumes restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger unmark * diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test index 1969e946a2..6910dde4bd 100755 --- a/regress/tests/migration-jobspan-test +++ b/regress/tests/migration-jobspan-test @@ -15,7 +15,7 @@ JobName=MigrationJobSpanSave scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf @@ -30,10 +30,10 @@ start_test # Pool Full uses Storage=DiskChanger # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=10 dir @#setdebug level=100 storage=File label storage=File volume=FileVolume001 Pool=Default @@ -60,7 +60,7 @@ wait @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger unmark * mark * diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test index 9dc74a85f0..5f19481677 100755 --- a/regress/tests/migration-occupancy-test +++ b/regress/tests/migration-occupancy-test @@ -13,7 +13,7 @@ JobName=MigrationJobSave scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test @@ -25,10 +25,10 @@ start_test # Pool Full uses Storage=DiskChanger # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 @@ -49,7 +49,7 @@ wait @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger unmark * mark * diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test index 3e744d4eb9..99de021cf2 100755 --- a/regress/tests/migration-time-test +++ b/regress/tests/migration-time-test @@ -13,7 +13,7 @@ JobName=MigrationJobSave scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test @@ -25,10 +25,10 @@ start_test # Pool Full uses Storage=DiskChanger # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 @@ -56,7 +56,7 @@ list volumes @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger unmark * mark * diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test index 55e6cf5952..2d5e57885c 100755 --- a/regress/tests/migration-volume-test +++ b/regress/tests/migration-volume-test @@ -13,7 +13,7 @@ JobName=MigVolBackup scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list #cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 #sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf @@ -27,10 +27,10 @@ start_test # Pool Full uses Storage=DiskChanger # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=FileVolume001 Pool=Default label storage=File volume=FileVolume002 Pool=Default update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default @@ -81,7 +81,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger unmark * mark * diff --git a/regress/tests/multi-client-test b/regress/tests/multi-client-test index c2dc95bd26..fb61105d19 100755 --- a/regress/tests/multi-client-test +++ b/regress/tests/multi-client-test @@ -16,10 +16,10 @@ scripts/copy-test-confs change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Make sure we can contact all clients @#setdebug level=100 dir status client=${HOST}-fd @@ -51,7 +51,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores client=${hostname}-fd select storage=File1 unmark * mark * diff --git a/regress/tests/query-test b/regress/tests/query-test index bb8febcbc9..a4d365e1fe 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -10,7 +10,7 @@ JobName=query scripts/cleanup scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list mkdir ${cwd}/tmp/build cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build cd ${cwd}/tmp @@ -21,10 +21,10 @@ cd ${cwd} change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 label storage=File volume=TestVolume002 run job=$JobName yes @@ -40,10 +40,10 @@ stop_bacula echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @# Force differental on the second Volume update volume=TestVolume001 VolStatus=Used run level=differental job=$JobName yes @@ -57,10 +57,10 @@ check_for_zombie_jobs storage=File stop_bacula echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run level=incremental job=$JobName yes wait messages @@ -97,7 +97,7 @@ query @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list yes wait @@ -113,7 +113,7 @@ stop_bacula # # Delete .c files because we will only restored the txt files # -rm -f tmp/build/*.c +rm -f ${cwd}/tmp/build/*.c check_two_logs check_restore_tmp_build_diff diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 6017365a34..a42151517f 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -11,15 +11,15 @@ JobName=Recycle scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 label storage=File1 volume=TestVolume002 label storage=File1 volume=TestVolume003 @@ -58,7 +58,7 @@ list volumes @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File1 unmark * mark * diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test index bfc7e486fe..692bd60b36 100755 --- a/regress/tests/regexwhere-test +++ b/regress/tests/regexwhere-test @@ -13,7 +13,7 @@ scripts/copy-test-confs /bin/cp -f scripts/bacula-dir.conf.regexwhere bin/bacula-dir.conf -echo "${cwd}/build/po" >/tmp/file-list +echo "${cwd}/build/po" >tmp/file-list start_test @@ -143,7 +143,7 @@ mod @## Where m 9 -/tmp/bacula-restore-it +tmp/bacula-restore-it m @## use add suffix 10 @@ -182,7 +182,7 @@ fi J=JobB # $cwd begins with / if grep -q "Restore OK" tmp/RUN_$J && - grep -q "/tmp/bacula-restore${cwd}/po/fr.po.old" tmp/RUN_$J + grep -q "tmp/bacula-restore${cwd}/po/fr.po.old" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok else @@ -192,7 +192,7 @@ fi J=JobC if grep -q "Restore OK" tmp/RUN_$J && - grep -q "/tmp/bacula-restore${cwd}/build/po/fr.po" tmp/RUN_$J + grep -q "tmp/bacula-restore${cwd}/build/po/fr.po" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok else @@ -231,7 +231,7 @@ fi J=JobG if grep -q "Restore OK" tmp/RUN_$J && - grep -q "/tmp/bacula-restore/build/po/fr.po" tmp/RUN_$J + grep -q "tmp/bacula-restore/build/po/fr.po" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok else @@ -263,7 +263,7 @@ fi J=JobJ if grep -q "Restore OK" tmp/RUN_$J && grep -q "/etc/passwd.old" tmp/RUN_$J && - grep -q -e "Where: */tmp/bacula-restore-it" tmp/RUN_$J && + grep -q -e "Where: *tmp/bacula-restore-it" tmp/RUN_$J && grep -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape index f7bed837f0..15b22c66a1 100755 --- a/regress/tests/relabel-tape +++ b/regress/tests/relabel-tape @@ -10,15 +10,15 @@ JobName=Relabeltape scripts/cleanup-tape scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full yes wait @@ -56,7 +56,7 @@ echo "Backup done" # # now do several restores to ensure we cleanup between jobs # -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null restore where=${cwd}/tmp/bacula-restores select all done yes @@ -64,7 +64,7 @@ wait restore where=${cwd}/tmp/bacula-restores select all done yes wait -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out @# @# now unmount the tape and start two restores @# at the same time diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index ef84d56540..2eb84d8150 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -11,7 +11,7 @@ JobName=restorebyfile . scripts/functions copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 @@ -20,10 +20,10 @@ sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=$JobName level=Full yes wait @@ -31,7 +31,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list yes wait @@ -56,17 +56,17 @@ for i in `cat ${cwd}/tmp/restore2-list`; do fi done -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out run job=$JobName level=Full yes wait messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores 7 <${cwd}/tmp/restore2-list diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index 3ac3cf7102..ec5a70fc22 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -10,7 +10,7 @@ JobName=restorebyfile scripts/cleanup scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list mkdir ${cwd}/tmp/build cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build cd ${cwd}/tmp/build @@ -23,10 +23,10 @@ cd ${cwd} change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=$JobName yes wait @@ -34,7 +34,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File 7 <${cwd}/tmp/restore-list diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index d02394be2a..38fc0f7b7b 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -12,7 +12,7 @@ JobName=restore-disk-seek scripts/cleanup scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list rm -rf ${cwd}/tmp/build mkdir ${cwd}/tmp/build # Copy only the .c files (to be restored) @@ -48,10 +48,10 @@ sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=$JobName yes wait @@ -59,7 +59,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out setdebug level=30 fd setdebug level=11 storage=File sql diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape index 95a220c3f4..aa394beb60 100755 --- a/regress/tests/restore-seek-tape +++ b/regress/tests/restore-seek-tape @@ -11,7 +11,7 @@ JobName=restore-tape-seek . scripts/functions copy_tape_confs -echo "${cwd}/tmp/build" >/tmp/file-list +echo "${cwd}/tmp/build" >${cwd}/tmp/file-list rm -rf ${cwd}/tmp/build mkdir ${cwd}/tmp/build # Copy only the .c files (to be restored) @@ -47,10 +47,10 @@ sed "s%# Maximum File Size = 1000000% Maximum File Size = 10KB%" ${cwd}/tmp/1 > change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 pool=Default run job=$JobName yes wait @@ -58,7 +58,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out setdebug level=30 fd setdebug level=10 storage=DDS-4 sql diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index e437611509..1a4553ab14 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -8,16 +8,16 @@ JobName=restore2byfile . scripts/functions copy_test_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list change_jobname CompressedTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 run job=$JobName yes wait @@ -25,7 +25,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2-list yes wait diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test index bd87c9d3a8..2dceb5d36d 100755 --- a/regress/tests/runscript-test +++ b/regress/tests/runscript-test @@ -10,41 +10,41 @@ JobName=backup copy_test_confs rm -f bin/bacula-dir.conf -rm -f tmp/RUN*log -rm -f tmp/RUN_FD_FAILED +rm -f ${cwd}/tmp/RUN*log +rm -f ${cwd}/tmp/RUN_FD_FAILED -touch tmp/log1.out +touch ${cwd}/tmp/log1.out /bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf -echo "${cwd}/build/po" >/tmp/file-list +echo "${cwd}/build/po" >${cwd}/tmp/file-list start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages label volume=TestVolume001 -@$out tmp/RUN_FD_WARNING.log +@$out ${cwd}/tmp/RUN_FD_WARNING.log run job=RUN_FD_WARNING yes wait messages @sleep 1 -@$out tmp/RUN_ALL_OK.log +@$out ${cwd}/tmp/RUN_ALL_OK.log run job=RUN_ALL_OK yes wait messages @sleep 1 -@$out tmp/RUN_FD_FAILED.log +@$out ${cwd}/tmp/RUN_FD_FAILED.log run job=RUN_FD_FAILED yes wait messages @sleep 1 -@$out tmp/RUN_DIR_FAILED.log +@$out ${cwd}/tmp/RUN_DIR_FAILED.log run job=RUN_DIR_FAILED yes wait messages @sleep 1 -@$out tmp/RUN_FD_FAILED2.log +@$out ${cwd}/tmp/RUN_FD_FAILED2.log run job=RUN_FD_FAILED2 yes wait messages @@ -63,13 +63,13 @@ export dstat export bstat export rstat -grep 'dir: BeforeJob: run command "/bin/echo RunBeforeJob"' tmp/RUN_ALL_OK.log >/dev/null 2>&1 +grep 'dir: BeforeJob: run command "/bin/echo RunBeforeJob"' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null 2>&1 a=$? -grep 'fd: ClientRunBeforeJob: ClientRunBeforeJob' tmp/RUN_ALL_OK.log >/dev/null 2>&1 +grep 'fd: ClientRunBeforeJob: ClientRunBeforeJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null 2>&1 b=$? -grep 'fd: ClientAfterJob: run command "/bin/echo ClientRunAfterJob' tmp/RUN_ALL_OK.log >/dev/null 2>&1 +grep 'fd: ClientAfterJob: run command "/bin/echo ClientRunAfterJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null 2>&1 c=$? -grep 'dir: AfterJob: run command "/bin/echo RunAfterJob' tmp/RUN_ALL_OK.log >/dev/null 2>&1 +grep 'dir: AfterJob: run command "/bin/echo RunAfterJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null 2>&1 d=$? if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 ] then @@ -79,9 +79,9 @@ else rstat=1 fi -grep 'dir: BeforeJob: run command "/bin/false RUN_DIR_FAILED"' tmp/RUN_DIR_FAILED.log >/dev/null 2>&1 +grep 'dir: BeforeJob: run command "/bin/false RUN_DIR_FAILED"' ${cwd}/tmp/RUN_DIR_FAILED.log >/dev/null 2>&1 a=$? -grep 'dir: AfterJob: RunAfterFailedJob' tmp/RUN_DIR_FAILED.log >/dev/null 2>&1 +grep 'dir: AfterJob: RunAfterFailedJob' ${cwd}/tmp/RUN_DIR_FAILED.log >/dev/null 2>&1 b=$? if [ $a = 0 -a $b = 0 ] then @@ -91,16 +91,16 @@ else rstat=1 fi -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 a=$? -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 b=$? -grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 c=$? -#grep 'touching' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 -test -f tmp/RUN_FD_FAILED +#grep 'touching' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +test -f ${cwd}/tmp/RUN_FD_FAILED d=$? -grep '*** Backup Error ***' tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 e=$? if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 ] then @@ -110,15 +110,15 @@ else rstat=1 fi -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 a=$? -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 b=$? -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED3"' tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED3"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 c=$? -grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 +grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 d=$? -grep '*** Backup Error ***' tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 +grep '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null 2>&1 e=$? if [ $a = 0 -a $b != 0 -a $c = 0 -a $d = 0 -a $e = 0 ] then @@ -128,11 +128,11 @@ else rstat=1 fi -grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_WARNING"' tmp/RUN_FD_WARNING.log >/dev/null 2>&1 +grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_WARNING"' ${cwd}/tmp/RUN_FD_WARNING.log >/dev/null 2>&1 a=$? -grep 'RunAfterFailedJob' tmp/RUN_FD_WARNING.log >/dev/null 2>&1 +grep 'RunAfterFailedJob' ${cwd}/tmp/RUN_FD_WARNING.log >/dev/null 2>&1 b=$? -grep 'Backup OK -- with warnings' tmp/RUN_FD_WARNING.log >/dev/null 2>&1 +grep 'Backup OK -- with warnings' ${cwd}/tmp/RUN_FD_WARNING.log >/dev/null 2>&1 c=$? if [ $a = 0 -a $b != 0 -a $c = 0 ] then diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test index b63deca2c1..47a8cb96e8 100755 --- a/regress/tests/scratch-pool-test +++ b/regress/tests/scratch-pool-test @@ -24,9 +24,9 @@ scripts/cleanup scripts/copy-2disk-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list -outf="tmp/sed_tmp" +outf="${cwd}/tmp/sed_tmp" echo "s%# Maximum File Size% Maximum File Size%g" >${outf} cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf @@ -35,10 +35,10 @@ change_jobname NightlySave $JobName start_test # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0 update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0 @@ -54,7 +54,7 @@ llist volume=TestVolume001 @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index a925ff94e5..9b4571fee1 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -17,7 +17,7 @@ scripts/copy-testa-confs # copy special conf file /bin/cp -f scripts/testb-bacula-dir.conf bin/bacula-dir.conf -echo "${cwd}/tmp/largefile" >/tmp/file-list +echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list # Create 56MB file with random data echo "Creating a 56MB file with random data ..." dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 @@ -26,10 +26,10 @@ echo "largefile created" change_jobname MultiVol $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=50 storage=File run job=$JobName storage=File yes run job=$JobName storage=File yes @@ -42,7 +42,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out sql select * from JobMedia where JobId=4; select * from JobMedia where JobId=5; @@ -64,6 +64,6 @@ check_for_zombie_jobs storage=File stop_bacula check_two_logs -diff tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null +diff ${cwd}/tmp/largefile ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null dstat=$? end_test diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index d03cba2133..d6e8163a9a 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -9,17 +9,17 @@ JobName=smallfilesize copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default setdebug level=2 storage=DDS-4 run job=$JobName yes @@ -28,7 +28,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 unmark * mark * diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index 645eb98e2f..d687c7d526 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -11,15 +11,15 @@ JobName=SpanVol scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume004 label storage=File1 volume=TestVolume003 label storage=File1 volume=TestVolume002 @@ -34,7 +34,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select storage=File1 unmark * mark * diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index 57947786b9..47e05e41c1 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -10,14 +10,14 @@ JobName=Sparse-conpressed cwd=`pwd` scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list start_test -cat >tmp/bconcmds <${cwd}/tmp/bconcmds </tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list cd ${cwd}/build/src/tools ./gigaslam if [ $? != 0 ]; then @@ -21,10 +21,10 @@ cd ${cwd} change_jobname SparseTest $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File volume=TestVolume001 setdebug level=10 fd run job=$JobName yes @@ -34,7 +34,7 @@ list volumes @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out @# setdebug level=0 fd restore where=${cwd}/tmp/bacula-restores storage=File 5 diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 9d94c71892..38d12fd998 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -9,14 +9,14 @@ JobName=SparseTest scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list start_test -cat >tmp/bconcmds <${cwd}/tmp/bconcmds <${cwd}/bin/bacula-dir.conf -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list start_test # Write out bconsole commands to a file -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=150 storage=DDS-4 label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 @@ -88,7 +88,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test index f52caf1cda..92ff97f656 100755 --- a/regress/tests/three-pool-test +++ b/regress/tests/three-pool-test @@ -15,12 +15,12 @@ scripts/cleanup scripts/copy-2disk-drive-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test # Turn off Prefer Mounted Volumes so we use 2 drives -outf="tmp/sed_tmp" +outf="${cwd}/tmp/sed_tmp" echo "s%# Prefer Mounted Volumes% Prefer Mounted Volumes%g" >${outf} cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 # Comment the next line out to write everything to one drive @@ -28,10 +28,10 @@ cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @output /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=DDS-4 @#setdebug level=200 client label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 @@ -57,13 +57,13 @@ END_OF_DATA # exit run_bacula -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait diff --git a/regress/tests/tls-test b/regress/tests/tls-test index 5abc1179e6..8e8899408e 100755 --- a/regress/tests/tls-test +++ b/regress/tests/tls-test @@ -9,7 +9,7 @@ JobName=tls scripts/cleanup scripts/copy-tls-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname CompressedTest $JobName start_test diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape index a97ba7c3b4..98c0b8387e 100755 --- a/regress/tests/truncate-bug-tape +++ b/regress/tests/truncate-bug-tape @@ -8,7 +8,7 @@ JobName=truncatebug copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index 30817d65b3..4f1fdabdcd 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -10,7 +10,7 @@ JobName=Two-Jobs cwd=`pwd` scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname CompressedTest $JobName start_test diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape index 179598d64b..8b15caf13d 100755 --- a/regress/tests/two-pool-tape +++ b/regress/tests/two-pool-tape @@ -4,7 +4,7 @@ # an autochanger. Note, the Director has three Pools in its # conf: Default, Full, and Inc. Default is used in the # NightlySave job by default. What is backed up is what -# is in /tmp/file-list, which is by default the Bacula +# is in ${cwd}/tmp/file-list, which is by default the Bacula # source code (i.e. the build directory). # TestName="two-pool-tape" @@ -23,11 +23,11 @@ scripts/prepare-two-tapes echo "Done prepare two tapes" # Make a relatively large backup set 5 x source code directory -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >>${cwd}/tmp/file-list +echo "${cwd}/build" >>${cwd}/tmp/file-list +echo "${cwd}/build" >>${cwd}/tmp/file-list +echo "${cwd}/build" >>${cwd}/tmp/file-list start_test diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test index fe1aae6d2a..e6d729acc6 100755 --- a/regress/tests/two-pool-test +++ b/regress/tests/two-pool-test @@ -4,7 +4,7 @@ # an autochanger. Note, the Director has three Pools in its # conf: Default, Full, and Inc. Default is used in the # NightlySave job by default. What is backed up is what -# is in /tmp/file-list, which is by default the Bacula +# is in ${cwd}/tmp/file-list, which is by default the Bacula # source code (i.e. the build directory). # # Note, we use the virtual disk autochanger. @@ -20,10 +20,10 @@ scripts/prepare-two-disks # Make a relatively large backup set 5 x source code directory # Reduced to 1 for portable -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list start_test diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 2e2d6455ce..15f48ee5b2 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -10,7 +10,7 @@ JobName=TwoVol cwd=`pwd` scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape index d7b1512494..e6c5312e24 100755 --- a/regress/tests/two-volume-tape +++ b/regress/tests/two-volume-tape @@ -18,7 +18,7 @@ scripts/cleanup scripts/copy-2tape-confs scripts/prepare-two-tapes -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list outf="tmp/sed_tmp" echo "s%# Maximum File Size% Maximum File Size%g" >${outf} diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index c5ec0ecf1d..1266e75d76 100755 --- a/regress/tests/two-volume-test +++ b/regress/tests/two-volume-test @@ -16,7 +16,7 @@ scripts/cleanup scripts/copy-2disk-confs scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list outf="tmp/sed_tmp" echo "s%# Maximum File Size% Maximum File Size%g" >${outf} diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root index 64d9040c35..dbc0ed9daf 100755 --- a/regress/tests/usr-tape-root +++ b/regress/tests/usr-tape-root @@ -7,7 +7,7 @@ cwd=`pwd` . scripts/functions scripts/copy-tape-confs scripts/cleanup-tape -echo "/usr" >/tmp/file-list +echo "/usr" >${cwd}/tmp/file-list echo " " echo " " diff --git a/regress/tests/verify-cat-test b/regress/tests/verify-cat-test index 6a43b48300..909dfedc32 100755 --- a/regress/tests/verify-cat-test +++ b/regress/tests/verify-cat-test @@ -9,10 +9,10 @@ JobName=VerifyCatalog cwd=`pwd` scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list -#echo "${cwd}/do_all" >/tmp/file-list -#echo "${cwd}/do_all_tapes" >>/tmp/file-list -#echo "${cwd}/do_file" >>/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list +#echo "${cwd}/do_all" >${cwd}/tmp/file-list +#echo "${cwd}/do_all_tapes" >>${cwd}/tmp/file-list +#echo "${cwd}/do_file" >>${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape index ffc6d02fe2..9927adee7b 100755 --- a/regress/tests/verify-vol-tape +++ b/regress/tests/verify-vol-tape @@ -9,7 +9,7 @@ JobName=VerifyVol copy_tape_confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 5fb677b347..88e875ac66 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -10,7 +10,7 @@ JobName=VerifyVol cwd=`pwd` scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 3ef08d2cc1..1c1c34d294 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -23,8 +23,8 @@ change_jobname NightlySave $JobName # that are only saved once. In 1.33, Bacula now deals # with this situation. # -echo "${cwd}/weird-files" >/tmp/file-list -echo "${cwd}/weird-files" >>/tmp/file-list +echo "${cwd}/weird-files" >${cwd}/tmp/file-list +echo "${cwd}/weird-files" >>${cwd}/tmp/file-list # Create a Unix domain socket (sock-file) cd weird-files diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index 16f9120d57..ae3aad6954 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -17,7 +17,7 @@ scripts/cleanup scripts/copy-test-confs rm -rf weird-files2 cp -Rp weird-files weird-files2 -echo "${cwd}/weird-files2" >/tmp/file-list +echo "${cwd}/weird-files2" >${cwd}/tmp/file-list cd weird-files2 perl socket.pl cd .. diff --git a/regress/tests/win32-backup-tape b/regress/tests/win32-backup-tape index aa7d5bfdcf..299fdd4873 100755 --- a/regress/tests/win32-backup-tape +++ b/regress/tests/win32-backup-tape @@ -11,7 +11,7 @@ JobName=win32tape scripts/copy-win32-confs scripts/cleanup-tape -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname $JobName start_test @@ -32,7 +32,7 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=c:/tmp/bacula-restores select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape index 167b9d325d..05abd85716 100755 --- a/regress/tests/win32-to-linux-tape +++ b/regress/tests/win32-to-linux-tape @@ -11,7 +11,7 @@ JobName=AutoLabel scripts/copy-win32-confs scripts/cleanup-tape -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_job $JobName start_test @@ -32,7 +32,7 @@ messages @# now do a restore @# @$out tmp/log2.out -restore where=/tmp/bacula-restores client=Tibs select all storage=DDS-4 done +restore where=${cwd}/tmp/bacula-restores client=Tibs select all storage=DDS-4 done yes wait messages -- 2.39.5