Make failures more obvious

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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index d2efe39db8c851b6cd2c26a1e8b510809a6d099f..74e778aa8bcfe6d9a1aa63ff6408ef3dd1d48a35 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -50,8 +50,8 @@ diff -r build /tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== Backup Bacula Test failed!!! ===== "
-   echo "  ===== Backup Bacula Test failed!!! ===== " >>test.out
+   echo "  !!!!! Backup Bacula Test failed!!! !!!!! "
+   echo "  !!!!! Backup Bacula Test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== Backup Bacula Test OK ===== "

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index bd78419d420fb3d32acee0444c948dc29d51bf14..03cef1028616857eeaa16e0db2295bbe0161634d 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -78,8 +78,8 @@ diff -r build  tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== bscan-test Bacula source failed!!! ===== "
-   echo "  ===== bscan-test failed!!! ===== " >>test.out
+   echo "  !!!!! bscan-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! bscan-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== bscan-test Bacula source OK ===== "

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 5a86849f0487a881040fcd21b14bf145c1bab68c..aee18ae874876d45661a6832c49584661b4d7369 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -50,8 +50,8 @@ diff -r build /tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== compressed-test Bacula source failed!!! ===== "
-   echo "  ===== compressed-test failed!!! ===== " >>test.out
+   echo "  !!!!! compressed-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! compressed-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== compressed-test Bacula source OK ===== "

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 2af285a60926d9c9766e468667771ed4f6604827..804e00541d6e3398fa63772ecb2fab9c255ca4a0 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -60,8 +60,8 @@ diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== concurrent-jobs-test Bacula source failed!!! ===== "
-   echo "  ===== concurrent-jobs-test failed!!! ===== " >>test.out
+   echo "  !!!!! concurrent-jobs-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! concurrent-jobs-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== concurrent-jobs-test Bacula source OK ===== "

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index c6ae5b3cf828d4983dc99d9c54b7e4dda5d87714..c5a99736ead57291f380295bc61c950849478f91 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -57,8 +57,8 @@ diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== six-vol-test Bacula source failed!!! ===== "
-   echo "  ===== six-vol-test failed!!! ===== " >>test.out
+   echo "  !!!!! six-vol-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! six-vol-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== six-vol-test Bacula source OK ===== "

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 95dd325922d4ab0bf00e2ebb8743dff2abfb2321..4d4784c0fd27da73ce9865e9a114415e374f99ff 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -50,8 +50,8 @@ diff -r build /tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== sparse-compressed-test Bacula source failed!!! ===== "
-   echo "  ===== sparse-compressed-test failed!!! ===== " >>test.out
+   echo "  !!!!! sparse-compressed-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! sparse-compressed-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== sparse-compressed-test Bacula source OK ===== "

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 4921fdf0ff4b3d0a995bd516b948f9fae3bde858..2c8c5812868f2dba789b3a72fd97d9014e325014 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -50,8 +50,8 @@ diff -r build /tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== sparse-test Bacula source failed!!! ===== "
-   echo "  ===== sparse-test failed!!! ===== " >>test.out
+   echo "  !!!!! sparse-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! sparse-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== sparse-test Bacula source OK ===== "

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 136aa4ea72147ff5e9954fd7f38cf1b8ff5e7dcf..09ef5dd286ec95ef2a322d26435eb6e20211c146 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -65,8 +65,8 @@ diff -r build /tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== two-jobs-test Bacula source failed!!! ===== "
-   echo "  ===== two-jobs-test failed!!! ===== " >>test.out
+   echo "  !!!!! two-jobs-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! two-jobs-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== two-jobs-test Bacula source OK ===== "

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index de926bf6a59ab566b06180b794bde74688b51c3f..6f11b5d0482d85b6bf384398d4fffb0bb0b7b7f3 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -56,8 +56,8 @@ diff -r build  tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== two-vol-test Bacula source failed!!! ===== "
-   echo "  ===== two-vol-test failed!!! ===== " >>test.out
+   echo "  !!!!! two-vol-test Bacula source failed!!! !!!!! "
+   echo "  !!!!! two-vol-test failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== two-vol-test Bacula source OK ===== "

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index d6bd8e8348fa04080557f511dd6ff4123fea6ad7..8afcf8ddf0271bc19caa7b536926bb393f0ba281 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -21,7 +21,7 @@ bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
+@tee    tmp/log1.out
 label storage=File
 TestVolume001
 run job=NightlySave
@@ -31,7 +31,7 @@ messages
 @# 
 @# now do a verify volume
 @#
-@output ${cwd}/tmp/original
+@tee    ${cwd}/tmp/original
 run job=VerifyVolume
 yes
 wait
@@ -47,8 +47,8 @@ grep "^Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== Verify Volume failed!!! ===== "
-   echo "  ===== Verify Volume failed!!! ===== " >>test.out
+   echo "  !!!!! Verify Volume failed!!! !!!!! "
+   echo "  !!!!! Verify Volume failed!!! !!!!! " >>test.out
    echo " "
 else
    echo "  ===== Verify Volume Test OK ===== "