Update scripts

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1834 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/do_all b/regress/do_all
index 1787b27a23cf68d4e3609fc90330e54e443a7990..8df3b966fa2d7ca0b1498bbefea6e416ff792512 100755 (executable)
--- a/regress/do_all
+++ b/regress/do_all
@@ -1,5 +1,5 @@
 #!/bin/sh
 make setup
 ./starttime
-./all-non-root-tests
+./all-tape-and-file-tests
 ./endtime

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 83b118af2288f4d3ed00d006db512eaf81dc8a3e..cd1d085ae78169d6afead1075c0563aa6fd43713 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -24,7 +24,15 @@ rm -f Makefile config.cache
 # Remove files that may be too big
 cd doc/latex
 make clean
-cd ../..
+cd ../latex-fr
+make clean
+cd ../images
+rm -f *.png *.jpg *.gif *.eps
+rm -rf hires
+cd ${cwd}/build
+cd rescue/linux/cdrom/cdtree
+rm -rf bacula-*
+cd ${cwd}/build
 # Run Bacula configuration, make, install
 ./regress-config ${cwd} $2 $3 $4
 make

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 34bd0d430179866413fe648a6b36f56a7dca43bb..5eece0f9e7a73246c1b4c165a961d9e79418c1bb 100755 (executable)
--- 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 ==="
-echo " === Starting auto-label-test ===" >>working/log
+echo " === Starting auto-label-test `date +%R:%S` ==="
+echo " === Starting auto-label-test `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 90740c2aa3dec5742c9ebbc7189094e44892c435..788521862b699a6148d693f4980e14521412f565 100755 (executable)
--- 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 ==="
-echo " === Starting Bacula tape test ===" >>working/log
+echo " === Starting Bacula tape test `date +%R:%S` ==="
+echo " === Starting Bacula tape test `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 e382cafa22bd05614048ae980a0b774dd1b5337f..53d5dc900bd841d97a3be5236b901cb7362b0a38 100755 (executable)
--- 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 ==="
-echo " === Starting Backup Bacula Test ===" >>working/log
+echo " === Starting Backup Bacula Test `date +%R:%S` ==="
+echo " === Starting Backup Bacula Test `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 6ab69f3e24822aedde539e4d817b5e4b527687ea..eca110618b3bf2755bd58e5966e7faf3d91128a4 100755 (executable)
--- 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  ==="
-echo " === Starting bextract-test  ===" >working/log
+echo " === Starting bextract-test `date +%R:%S` ==="
+echo " === Starting bextract-test `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 dc204208ce0353844a89cee6fd76a0a79e599d0e..09618bd3eae1c79db3aeab81b69fba9f023704be 100755 (executable)
--- 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  ==="
-echo " === Starting bscan-tape  ===" >>working/log
+echo " === Starting bscan-tape `date +%R:%S` ==="
+echo " === Starting bscan-tape `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 450bd8b071349f761d2b46be4b8aa2ae7629a4c0..a81e2a51c453d98b99de19a2c9a7a6e72f9b0dad 100755 (executable)
--- 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  ==="
-echo " === Starting bscan-test  ===" >working/log
+echo " === Starting bscan-test `date +%R:%S` ==="
+echo " === Starting bscan-test `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 d27dab77588865f9673b56eb1f477793f902c434..de2274e6ed643de9748998f6cb68a4e6f60f73d0 100755 (executable)
--- 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  ==="
-echo " === Starting bsr-opt-test  ===" >working/log
+echo " === Starting bsr-opt-test `date +%R:%S` ==="
+echo " === Starting bsr-opt-test `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 a2d5b5a2815c32c968c6105b49c918f11aa74a5c..abcd8fed02b2b975d85c21ca4eddd119d60d9e8c 100755 (executable)
--- 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 ==="
-echo " === Starting btape fill test ===" >>working/log
+echo " === Starting btape fill test `date +%R:%S` ==="
+echo " === Starting btape fill test `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/btape -c bin/bacula-sd.conf DDS-4 <<END_OF_DATA 2>&1 >tmp/log1.out

diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape
index e32df1e394c3d57396d99a9541a419aa3fa8025a..51233129c16c0f2e85f96cd8e4587491ddaafbe4 100755 (executable)
--- 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 ==="
-echo " === Starting btape fill test ===" >>working/log
+echo " === Starting btape fill test `date +%R:%S` ==="
+echo " === Starting btape fill test `date +%R:%S` ===" >>working/log
 echo " "
 exit
 bin/btape -c bin/bacula-sd.conf DDS-4 <<END_OF_DATA 2>&1 >tmp/log1.out

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 5d97af5694bb4efec2d4cb004810b1619348a3b8..ea93469a4a7209bf0b241dd0301ec47b1f86a41f 100755 (executable)
--- 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 ==="
-echo " === Starting compressed-test ===" >>working/log
+echo " === Starting compressed-test `date +%R:%S` ==="
+echo " === Starting compressed-test `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 5fb48dcb607fffa600e900a5acc2937e8b4b9442..0dd477f2ae0a959101965451c995aaf630b5c091 100755 (executable)
--- 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  ==="
-echo " === Starting concurrent-jobs-test  ===" >>working/log
+echo " === Starting concurrent-jobs-test `date +%R:%S` ==="
+echo " === Starting concurrent-jobs-test `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 5fdf28b8b4045780ddd5e96935464eea3fd6511b..9473c55686bac73c25b95c6a81b2d185e3df6559 100755 (executable)
--- a/regress/tests/decremental-test
+++ b/regress/tests/decremental-test
@@ -16,8 +16,8 @@ cd ${cwd}
 
 echo " "
 echo " "
-echo " === Starting decremental-test ==="
-echo " === Starting decremental-test ===" >>working/log
+echo " === Starting decremental-test `date +%R:%S` ==="
+echo " === Starting decremental-test `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 a1cdf398a3761fbff46093dc77a46588e1fb46f7..c88697d6537ac3c8461cfbf511b8fdd24bc7d2a9 100755 (executable)
--- 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 ==="
-echo " === Starting Fixed Block Size test ===" >>working/log
+echo " === Starting Fixed Block Size test `date +%R:%S` ==="
+echo " === Starting Fixed Block Size test `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 4f369df81c2657379bc89b48bb043cb4436d12f3..2f29bed98f74f2d7e7ad8be16d2a862a5547f6b5 100755 (executable)
--- 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  ==="
-echo " === Starting four-concurrent-jobs-tape  ===" >>working/log
+echo " === Starting four-concurrent-jobs-tape `date +%R:%S` ==="
+echo " === Starting four-concurrent-jobs-tape `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 d6982be53369d6a13072e90813e80e79ceddc016..7f621a772a66d2118e5ccffc7c9f5d6819ed74e9 100755 (executable)
--- 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  ==="
-echo " === Starting four-concurrent-jobs-test  ===" >>working/log
+echo " === Starting four-concurrent-jobs-test `date +%R:%S` ==="
+echo " === Starting four-concurrent-jobs-test `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 0a4ab4d25ac598ebcd44900db1ef445eb3e78d6a..523349c5d4a23f5f1a67ba08b8bacecd959048e1 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -12,18 +12,18 @@ echo "${cwd}/build" >/tmp/file-list
 
 echo " "
 echo " "
-echo " === Starting four-jobs-tape  ==="
-echo " === Starting four-jobs-tape  ===" >>working/log
+echo " === Starting four-jobs-tape `date +%R:%S` ==="
+echo " === Starting four-jobs-tape `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@tee /dev/null
 estimate job=NightlySave listing
 estimate job=NightlySave listing
 estimate job=NightlySave listing
 messages
-@output tmp/log1.out
+@tee tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
@@ -40,9 +40,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 # run a second job
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@tee /dev/null
 messages
-@output tmp/log1.out
+@tee tmp/log1.out
 run job=NightlySave level=Incremental yes
 wait
 messages
@@ -56,9 +56,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 # run a third job
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@tee /dev/null
 messages
-@output tmp/log1.out
+@tee tmp/log1.out
 run job=NightlySave level=Incremental yes
 wait
 messages
@@ -72,9 +72,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 # run a fourth job
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@tee /dev/null
 messages
-@output tmp/log1.out
+@tee tmp/log1.out
 run job=NightlySave level=Incremental yes
 wait
 messages
@@ -86,14 +86,14 @@ echo "Backup 4 done"
 # now do several restores to ensure we cleanup between jobs
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@tee /dev/null
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
-@output tmp/log2.out
+@tee tmp/log2.out
 @#
 @# now unmount the tape and start two restores
 @#  at the same time
@@ -109,7 +109,7 @@ yes
 mount storage=DDS-4
 wait
 messages
-@output
+@tee
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 5770a5bd3502d0e1c873e59481770ecbba9034e7..ad6a0be64cc9216e7b947e8a2357b1adc2975237 100755 (executable)
--- 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  ==="
-echo " === Starting four-jobs-test  ===" >>working/log
+echo " === Starting four-jobs-test `date +%R:%S` ==="
+echo " === Starting four-jobs-test `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 8c10980dd241b467e45757227990de032469d0c9..7a2fcffd1408da197a0cb8e8903701a650b08f83 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -19,8 +19,8 @@ cd ${cwd}
 
 echo " "
 echo " "
-echo " === Starting incremental-tape test ==="
-echo " === Starting incremental-tape test ===" >>working/log
+echo " === Starting incremental-tape test `date +%R:%S` ==="
+echo " === Starting incremental-tape test `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 9d5aeee25ebcbb7483ce5ccd4bded9d30b8991d9..372dc530cc5d9e49659ff4464964a07f35c66691 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -16,8 +16,8 @@ cd ${cwd}
 
 echo " "
 echo " "
-echo " === Starting incremental-test ==="
-echo " === Starting incremental-test ===" >>working/log
+echo " === Starting incremental-test `date +%R:%S` ==="
+echo " === Starting incremental-test `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 9c7cca4c0745394a1f4358d20e51a978aadd3083..a30adae0ba457758c64ff443af3c0b3e1b4e9bee 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -17,8 +17,8 @@ cd ${cwd}
 
 echo " "
 echo " "
-echo " === Starting query-test ==="
-echo " === Starting query-test ===" >>working/log
+echo " === Starting query-test `date +%R:%S` ==="
+echo " === Starting query-test `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 445f8e011746165c66540eb51b29651be678b940..637fd15e2289effbd65ac8376c51a8a80ea6660c 100755 (executable)
--- 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  ==="
-echo " === Starting recycle-test  ===" >working/log
+echo " === Starting recycle-test `date +%R:%S` ==="
+echo " === Starting recycle-test `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 858c271bfecfb61fbcaca95063aa250094ecd40c..1377af458658d786cfb2c83bfc4f576b3695da54 100755 (executable)
--- 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 ==="
-echo " === Starting restore-by-file-tape test ===" >>working/log
+echo " === Starting restore-by-file-tape test `date +%R:%S` ==="
+echo " === Starting restore-by-file-tape test `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 3c2cdee9a41337f27004ec87a06bcaa688fcbfe3..cd5c1b2523e6ec32ae3f801fc89f617efe1acefe 100755 (executable)
--- 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 ==="
-echo " === Starting restore-by-file-test ===" >>working/log
+echo " === Starting restore-by-file-test `date +%R:%S` ==="
+echo " === Starting restore-by-file-test `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 f49914d121d69520305de659099931989a5978df..987bb12873e473e5a9dc18a45c1ac85fa5a254af 100755 (executable)
--- 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 ==="
-echo " === Starting restore-disk-seek-test ===" >>working/log
+echo " === Starting restore-disk-seek-test `date +%R:%S` ==="
+echo " === Starting restore-disk-seek-test `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 cc77a67e74838f8b8e14a9c64e878e43b3f874a0..88511c488a28a57a3d29f9b04708e0f6ceff8a39 100755 (executable)
--- 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 ==="
-echo " === Starting restore2-by-file-test ===" >>working/log
+echo " === Starting restore2-by-file-test `date +%R:%S` ==="
+echo " === Starting restore2-by-file-test `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 f519a0d269abfa701bc5ead735d6ad41e48349e3..59df978e1cad464f6a05bf0b1c9ad7277cfbf75b 100755 (executable)
--- 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  ==="
-echo " === Starting six-vol-test  ===" >>working/log
+echo " === Starting six-vol-test `date +%R:%S` ==="
+echo " === Starting six-vol-test `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 0b13a607c856876786b8b5bf0e6a921052cd2f6f..3e170effd4de9a5a97a9423a5d105ad8fdde0afb 100755 (executable)
--- 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 ==="
-echo " === Starting Small File Size test ===" >>working/log
+echo " === Starting Small File Size test `date +%R:%S` ==="
+echo " === Starting Small File Size test `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 8215a698d35ab43174b27e351090c953af01796c..a83618e3b5a7f54f452ebedf7fc93d04e4f4f1fb 100755 (executable)
--- 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  ==="
-echo " === Starting span-vol-test  ===" >working/log
+echo " === Starting span-vol-test `date +%R:%S` ==="
+echo " === Starting span-vol-test `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 718cf6f3c7c069ad828988d1a846bddc28c4a9bf..6c335928998b7418169ad26a5a5e11e6d42f067b 100755 (executable)
--- 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 ==="
-echo " === Starting sparse-compressed-test ===" >>working/log
+echo " === Starting sparse-compressed-test `date +%R:%S` ==="
+echo " === Starting sparse-compressed-test `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 6edbdad123c12da15a720787751a88207868dcb4..9adab766b6380da3d6ca36cac268f98be08a11fb 100755 (executable)
--- 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 ==="
-echo " === Starting sparse-test ===" >>working/log
+echo " === Starting sparse-test `date +%R:%S` ==="
+echo " === Starting sparse-test `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 9a1963995f2270cb3196785f3e2defff27dd1866..ed074c60291e31f0f9ddb1d61477fd25e2c7b3b6 100755 (executable)
--- 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  ==="
-echo " === Starting two-jobs-test  ===" >>working/log
+echo " === Starting two-jobs-test `date +%R:%S` ==="
+echo " === Starting two-jobs-test `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 57a40654ab9ab1f628db10b8bb7c1ffc8ad2268d..8164b3a9bd19dac5786b88654de5869c6140df9d 100755 (executable)
--- 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  ==="
-echo " === Starting two-vol-test  ===" >working/log
+echo " === Starting two-vol-test `date +%R:%S` ==="
+echo " === Starting two-vol-test `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 81dcb6b4fe1b2d44fb379f6fd64186f0a3608b65..a7d4647ea9039e611292f26497f49e88ef6475fe 100755 (executable)
--- 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 ==="
-echo " === Starting Two Volume Tape test ===" >>working/log
+echo " === Starting Two Volume Tape test `date +%R:%S` ==="
+echo " === Starting Two Volume Tape test `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 d6c6a9fc60eb776f07f0f8667f6a27d8915de376..86bb9a004f16fb94cfbc9fa258dedd11b29477f9 100755 (executable)
--- 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 ==="
-echo " === Starting verify Volume Test ===" >>working/log
+echo " === Starting verify Volume Test `date +%R:%S` ==="
+echo " === Starting verify Volume Test `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 0c0733bb3c370344de9a7b896d22566c6824f538..3f364a907a31562b4335ff06d303ba11d268c707 100755 (executable)
--- 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 ==="
-echo " === Starting weird filenames test ===" >>working/log
+echo " === Starting weird filenames test `date +%R:%S` ==="
+echo " === Starting weird filenames test `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 f8c1e5a443472ec5d6ed51ecda856bad68c45f2b..34e67670842686759dfcd1bfc24675ea9d3a5a95 100755 (executable)
--- 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 ==="
-echo " === Starting weird filenames2 test ===" >>working/log
+echo " === Starting weird filenames2 test `date +%R:%S` ==="
+echo " === Starting weird filenames2 test `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/testls weird-files2 >${cwd}/tmp/original