From 128955de002b7391450fe33b0ccad5f72681ae5c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 20 Feb 2005 17:26:49 +0000 Subject: [PATCH] Update tests git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1835 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/all-non-root-tape-tests | 1 + regress/tests/auto-label-test | 4 +- regress/tests/backup-bacula-tape | 4 +- regress/tests/backup-bacula-test | 4 +- regress/tests/bextract-test | 4 +- regress/tests/bscan-tape | 4 +- regress/tests/bscan-test | 4 +- regress/tests/bsr-opt-test | 4 +- regress/tests/btape-fill-full-tape | 4 +- regress/tests/btape-fill-tape | 4 +- regress/tests/compressed-test | 4 +- regress/tests/concurrent-jobs-test | 4 +- regress/tests/decremental-test | 4 +- regress/tests/fixed-block-size-tape | 4 +- regress/tests/four-concurrent-jobs-tape | 4 +- regress/tests/four-concurrent-jobs-test | 4 +- regress/tests/four-jobs-tape | 4 +- regress/tests/four-jobs-test | 4 +- regress/tests/incremental-tape | 4 +- regress/tests/incremental-test | 4 +- regress/tests/query-test | 4 +- regress/tests/recycle-test | 4 +- regress/tests/restore-by-file-tape | 4 +- regress/tests/restore-by-file-test | 4 +- regress/tests/restore-disk-seek-test | 4 +- regress/tests/restore2-by-file-test | 4 +- regress/tests/six-vol-test | 4 +- regress/tests/small-file-size-tape | 4 +- regress/tests/span-vol-test | 4 +- regress/tests/sparse-compressed-test | 4 +- regress/tests/sparse-test | 4 +- regress/tests/truncate-bug-tape | 88 +++++++++++++++++++++++++ regress/tests/two-jobs-test | 4 +- regress/tests/two-vol-test | 4 +- regress/tests/two-volume-tape | 4 +- regress/tests/verify-vol-test | 4 +- regress/tests/weird-files-test | 4 +- regress/tests/weird-files2-test | 4 +- 38 files changed, 161 insertions(+), 72 deletions(-) create mode 100755 regress/tests/truncate-bug-tape diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests index 7af5fbf961..5f47e071cd 100755 --- a/regress/all-non-root-tape-tests +++ b/regress/all-non-root-tape-tests @@ -12,6 +12,7 @@ tests/four-jobs-tape tests/fixed-block-size-tape tests/bscan-tape tests/btape-fill-tape +tests/truncate-bug-tape echo " " echo " " echo "Test results" diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test index 5eece0f9e7..4d2d9dc1d7 100755 --- a/regress/tests/auto-label-test +++ b/regress/tests/auto-label-test @@ -12,8 +12,8 @@ sed "s%# Label Format% Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf echo " " echo " " -echo " === Starting auto-label-test `date +%R:%S` ===" -echo " === Starting auto-label-test `date +%R:%S` ===" >>working/log +echo " === Starting auto-label-test at `date +%R:%S` ===" +echo " === Starting auto-label-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 788521862b..304559d758 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -12,8 +12,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting Bacula tape test `date +%R:%S` ===" -echo " === Starting Bacula tape test `date +%R:%S` ===" >>working/log +echo " === Starting Bacula tape test at `date +%R:%S` ===" +echo " === Starting Bacula tape test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index 53d5dc900b..8cabf0423e 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -9,8 +9,8 @@ scripts/cleanup echo " " echo " " -echo " === Starting Backup Bacula Test `date +%R:%S` ===" -echo " === Starting Backup Bacula Test `date +%R:%S` ===" >>working/log +echo " === Starting Backup Bacula Test at `date +%R:%S` ===" +echo " === Starting Backup Bacula Test at `date +%R:%S` ===" >>working/log echo " " #bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index eca110618b..60b2aa2f51 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -11,8 +11,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting bextract-test `date +%R:%S` ===" -echo " === Starting bextract-test `date +%R:%S` ===" >working/log +echo " === Starting bextract-test at `date +%R:%S` ===" +echo " === Starting bextract-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 09618bd3ea..081e9e8504 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -15,8 +15,8 @@ sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula echo " " echo " " -echo " === Starting bscan-tape `date +%R:%S` ===" -echo " === Starting bscan-tape `date +%R:%S` ===" >>working/log +echo " === Starting bscan-tape at `date +%R:%S` ===" +echo " === Starting bscan-tape at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index a81e2a51c4..1a9644af4c 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -12,8 +12,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting bscan-test `date +%R:%S` ===" -echo " === Starting bscan-test `date +%R:%S` ===" >working/log +echo " === Starting bscan-test at `date +%R:%S` ===" +echo " === Starting bscan-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index de2274e6ed..c1724e855d 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -13,8 +13,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting bsr-opt-test `date +%R:%S` ===" -echo " === Starting bsr-opt-test `date +%R:%S` ===" >working/log +echo " === Starting bsr-opt-test at `date +%R:%S` ===" +echo " === Starting bsr-opt-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/btape-fill-full-tape b/regress/tests/btape-fill-full-tape index abcd8fed02..c61e5ddc3d 100755 --- a/regress/tests/btape-fill-full-tape +++ b/regress/tests/btape-fill-full-tape @@ -8,8 +8,8 @@ scripts/cleanup-tape echo " " echo " " -echo " === Starting btape fill test `date +%R:%S` ===" -echo " === Starting btape fill test `date +%R:%S` ===" >>working/log +echo " === Starting btape fill test at `date +%R:%S` ===" +echo " === Starting btape fill test at `date +%R:%S` ===" >>working/log echo " " bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape index 51233129c1..c97fd11f2b 100755 --- a/regress/tests/btape-fill-tape +++ b/regress/tests/btape-fill-tape @@ -13,8 +13,8 @@ sed "s%# MaximumVolumeSize% MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula echo " " echo " " -echo " === Starting btape fill test `date +%R:%S` ===" -echo " === Starting btape fill test `date +%R:%S` ===" >>working/log +echo " === Starting btape fill test at `date +%R:%S` ===" +echo " === Starting btape fill test at `date +%R:%S` ===" >>working/log echo " " exit bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index ea93469a4a..479634c5ee 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -10,8 +10,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting compressed-test `date +%R:%S` ===" -echo " === Starting compressed-test `date +%R:%S` ===" >>working/log +echo " === Starting compressed-test at `date +%R:%S` ===" +echo " === Starting compressed-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 0dd477f2ae..50da295770 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -25,8 +25,8 @@ echo "largefile created" echo " " echo " " -echo " === Starting concurrent-jobs-test `date +%R:%S` ===" -echo " === Starting concurrent-jobs-test `date +%R:%S` ===" >>working/log +echo " === Starting concurrent-jobs-test at `date +%R:%S` ===" +echo " === Starting concurrent-jobs-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test index 9473c55686..0b2a886359 100755 --- a/regress/tests/decremental-test +++ b/regress/tests/decremental-test @@ -16,8 +16,8 @@ cd ${cwd} echo " " echo " " -echo " === Starting decremental-test `date +%R:%S` ===" -echo " === Starting decremental-test `date +%R:%S` ===" >>working/log +echo " === Starting decremental-test at `date +%R:%S` ===" +echo " === Starting decremental-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape index c88697d653..48a3394c1c 100755 --- a/regress/tests/fixed-block-size-tape +++ b/regress/tests/fixed-block-size-tape @@ -24,8 +24,8 @@ rm -f ${cwd}/tmp/1 ${cwd}/tmp/2 echo " " echo " " -echo " === Starting Fixed Block Size test `date +%R:%S` ===" -echo " === Starting Fixed Block Size test `date +%R:%S` ===" >>working/log +echo " === Starting Fixed Block Size test at `date +%R:%S` ===" +echo " === Starting Fixed Block Size test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 2f29bed98f..456f9be1d9 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -10,8 +10,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting four-concurrent-jobs-tape `date +%R:%S` ===" -echo " === Starting four-concurrent-jobs-tape `date +%R:%S` ===" >>working/log +echo " === Starting four-concurrent-jobs-tape at `date +%R:%S` ===" +echo " === Starting four-concurrent-jobs-tape at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index 7f621a772a..a7d2508fbf 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -9,8 +9,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting four-concurrent-jobs-test `date +%R:%S` ===" -echo " === Starting four-concurrent-jobs-test `date +%R:%S` ===" >>working/log +echo " === Starting four-concurrent-jobs-test at `date +%R:%S` ===" +echo " === Starting four-concurrent-jobs-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index 523349c5d4..0657199401 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -12,8 +12,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting four-jobs-tape `date +%R:%S` ===" -echo " === Starting four-jobs-tape `date +%R:%S` ===" >>working/log +echo " === Starting four-jobs-tape at `date +%R:%S` ===" +echo " === Starting four-jobs-tape at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index ad6a0be64c..befb589a7f 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -11,8 +11,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting four-jobs-test `date +%R:%S` ===" -echo " === Starting four-jobs-test `date +%R:%S` ===" >>working/log +echo " === Starting four-jobs-test at `date +%R:%S` ===" +echo " === Starting four-jobs-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 7a2fcffd14..34dbc792a6 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -19,8 +19,8 @@ cd ${cwd} echo " " echo " " -echo " === Starting incremental-tape test `date +%R:%S` ===" -echo " === Starting incremental-tape test `date +%R:%S` ===" >>working/log +echo " === Starting incremental-tape test at `date +%R:%S` ===" +echo " === Starting incremental-tape test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 372dc530cc..4d5ea6c4e0 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -16,8 +16,8 @@ cd ${cwd} echo " " echo " " -echo " === Starting incremental-test `date +%R:%S` ===" -echo " === Starting incremental-test `date +%R:%S` ===" >>working/log +echo " === Starting incremental-test at `date +%R:%S` ===" +echo " === Starting incremental-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/query-test b/regress/tests/query-test index a30adae0ba..f5dc74d51b 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -17,8 +17,8 @@ cd ${cwd} echo " " echo " " -echo " === Starting query-test `date +%R:%S` ===" -echo " === Starting query-test `date +%R:%S` ===" >>working/log +echo " === Starting query-test at `date +%R:%S` ===" +echo " === Starting query-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 637fd15e22..de3a02dfe9 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -12,8 +12,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting recycle-test `date +%R:%S` ===" -echo " === Starting recycle-test `date +%R:%S` ===" >working/log +echo " === Starting recycle-test at `date +%R:%S` ===" +echo " === Starting recycle-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index 1377af4586..3378dc0b1d 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -17,8 +17,8 @@ sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula echo " " echo " " -echo " === Starting restore-by-file-tape test `date +%R:%S` ===" -echo " === Starting restore-by-file-tape test `date +%R:%S` ===" >>working/log +echo " === Starting restore-by-file-tape test at `date +%R:%S` ===" +echo " === Starting restore-by-file-tape test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index cd5c1b2523..0c88b9fd5c 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -18,8 +18,8 @@ cd ${cwd} echo " " echo " " -echo " === Starting restore-by-file-test `date +%R:%S` ===" -echo " === Starting restore-by-file-test `date +%R:%S` ===" >>working/log +echo " === Starting restore-by-file-test at `date +%R:%S` ===" +echo " === Starting restore-by-file-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 987bb12873..87cf6d52f1 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -32,8 +32,8 @@ sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula echo " " echo " " -echo " === Starting restore-disk-seek-test `date +%R:%S` ===" -echo " === Starting restore-disk-seek-test `date +%R:%S` ===" >>working/log +echo " === Starting restore-disk-seek-test at `date +%R:%S` ===" +echo " === Starting restore-disk-seek-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start -v -v 2>&1 >/dev/null diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index 88511c488a..8393abaac6 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -11,8 +11,8 @@ sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list echo " " echo " " -echo " === Starting restore2-by-file-test `date +%R:%S` ===" -echo " === Starting restore2-by-file-test `date +%R:%S` ===" >>working/log +echo " === Starting restore2-by-file-test at `date +%R:%S` ===" +echo " === Starting restore2-by-file-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index 59df978e1c..57f0b6f302 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -19,8 +19,8 @@ echo "largefile created" echo " " echo " " -echo " === Starting six-vol-test `date +%R:%S` ===" -echo " === Starting six-vol-test `date +%R:%S` ===" >>working/log +echo " === Starting six-vol-test at `date +%R:%S` ===" +echo " === Starting six-vol-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index 3e170effd4..214d84d864 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -13,8 +13,8 @@ sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula echo " " echo " " -echo " === Starting Small File Size test `date +%R:%S` ===" -echo " === Starting Small File Size test `date +%R:%S` ===" >>working/log +echo " === Starting Small File Size test at `date +%R:%S` ===" +echo " === Starting Small File Size test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index a83618e3b5..7f5262759e 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -12,8 +12,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting span-vol-test `date +%R:%S` ===" -echo " === Starting span-vol-test `date +%R:%S` ===" >working/log +echo " === Starting span-vol-test at `date +%R:%S` ===" +echo " === Starting span-vol-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index 6c33592899..449f82c639 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -11,8 +11,8 @@ bin/bacula stop 2>&1 >/dev/null echo " " echo " " -echo " === Starting sparse-compressed-test `date +%R:%S` ===" -echo " === Starting sparse-compressed-test `date +%R:%S` ===" >>working/log +echo " === Starting sparse-compressed-test at `date +%R:%S` ===" +echo " === Starting sparse-compressed-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 9adab766b6..0ce25c6fde 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -10,8 +10,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting sparse-test `date +%R:%S` ===" -echo " === Starting sparse-test `date +%R:%S` ===" >>working/log +echo " === Starting sparse-test at `date +%R:%S` ===" +echo " === Starting sparse-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape new file mode 100755 index 0000000000..7b7960446c --- /dev/null +++ b/regress/tests/truncate-bug-tape @@ -0,0 +1,88 @@ +#!/bin/sh +# +# Test for a tape truncation bug. +# +cwd=`pwd` + +scripts/copy-tape-confs +scripts/cleanup-tape +echo "${cwd}/build" >/tmp/file-list + +echo " " +echo " " +echo " === Starting truncate-bug-tape test at `date +%R:%S` ===" +echo " === Starting truncate-bug-tape test at `date +%R:%S` ===" >>working/log +echo " " + +#bin/bacula start 2>&1 >/dev/null +bin/bacula start +bin/bconsole -c bin/bconsole.conf <&1 >/dev/null +grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null +bstat=$? +grep "^ Termination: *Backup OK" tmp/log2.out 2>&1 >/dev/null +rstat=$? +if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " " + echo " " + echo " !!!!! truncate-bug-tape test Bacula source failed!!! !!!!! " + echo " !!!!! truncate-bug-tape test failed!!! !!!!! " >>test.out + echo " " +else + echo " ===== truncate-bug-tape test Bacula source OK ===== " + echo " ===== truncate-bug-tape test OK ===== " >>test.out + scripts/cleanup +fi diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index ed074c6029..2b0d986f76 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -10,8 +10,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting two-jobs-test `date +%R:%S` ===" -echo " === Starting two-jobs-test `date +%R:%S` ===" >>working/log +echo " === Starting two-jobs-test at `date +%R:%S` ===" +echo " === Starting two-jobs-test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 8164b3a9bd..223e953830 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -10,8 +10,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting two-vol-test `date +%R:%S` ===" -echo " === Starting two-vol-test `date +%R:%S` ===" >working/log +echo " === Starting two-vol-test at `date +%R:%S` ===" +echo " === Starting two-vol-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape index a7d4647ea9..1c57efd21b 100755 --- a/regress/tests/two-volume-tape +++ b/regress/tests/two-volume-tape @@ -20,8 +20,8 @@ sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf echo " " echo " " -echo " === Starting Two Volume Tape test `date +%R:%S` ===" -echo " === Starting Two Volume Tape test `date +%R:%S` ===" >>working/log +echo " === Starting Two Volume Tape test at `date +%R:%S` ===" +echo " === Starting Two Volume Tape test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 86bb9a004f..1f050ce65c 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -10,8 +10,8 @@ echo "${cwd}/build" >/tmp/file-list echo " " echo " " -echo " === Starting verify Volume Test `date +%R:%S` ===" -echo " === Starting verify Volume Test `date +%R:%S` ===" >>working/log +echo " === Starting verify Volume Test at `date +%R:%S` ===" +echo " === Starting verify Volume Test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 3f364a907a..6af487d530 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -22,8 +22,8 @@ echo "${cwd}/weird-files" >>/tmp/file-list echo " " echo " " -echo " === Starting weird filenames test `date +%R:%S` ===" -echo " === Starting weird filenames test `date +%R:%S` ===" >>working/log +echo " === Starting weird filenames test at `date +%R:%S` ===" +echo " === Starting weird filenames test at `date +%R:%S` ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index 34e6767084..07fa31956c 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -17,8 +17,8 @@ echo "${cwd}/weird-files2" >/tmp/file-list echo " " echo " " -echo " === Starting weird filenames2 test `date +%R:%S` ===" -echo " === Starting weird filenames2 test `date +%R:%S` ===" >>working/log +echo " === Starting weird filenames2 test at `date +%R:%S` ===" +echo " === Starting weird filenames2 test at `date +%R:%S` ===" >>working/log echo " " bin/testls weird-files2 >${cwd}/tmp/original -- 2.39.5