From: Kern Sibbald Date: Sun, 29 Aug 2004 15:36:19 +0000 (+0000) Subject: Add new regression updates X-Git-Tag: Release-1.35.2~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=01f68368523775739584ab5f707e785e99c70f4a;p=bacula%2Fbacula Add new regression updates git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1567 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/run b/regress/run new file mode 100755 index 0000000000..d48e2623c6 --- /dev/null +++ b/regress/run @@ -0,0 +1,3 @@ +#!/bin/sh +bin/bacula start +bin/bconsole -c bin/bconsole.conf diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test index ef2ae58c84..8558939a44 100755 --- a/regress/tests/auto-label-test +++ b/regress/tests/auto-label-test @@ -56,6 +56,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! auto-label-test failed!!! !!!!! " echo " !!!!! auto-label-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== auto-label-test OK ===== " diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index 6c52b3240c..94843b6ae9 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -45,6 +45,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! Backup Bacula Test failed!!! !!!!! " echo " !!!!! Backup Bacula Test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== Backup Bacula Test OK ===== " diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index e3b0f740c9..1521ab67a5 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -49,6 +49,13 @@ if [ $? != 0 -o $bstat != 0 ] ; then echo " " echo " !!!!! bextract-test Bacula source failed!!! !!!!! " echo " !!!!! bextract-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== bextract-test Bacula source OK ===== " diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index a55851c58d..310a1806c1 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -74,9 +74,16 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! bscan-test Bacula source failed!!! !!!!! " echo " !!!!! bscan-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== bscan-test Bacula source OK ===== " echo " ===== bscan-test OK ===== " >>test.out - scripts/cleanup +# scripts/cleanup fi diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 7736ae1006..74002e23a4 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -63,6 +63,16 @@ if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! bsr-opt-test Bacula source failed!!! !!!!! " echo " !!!!! bsr-opt-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + elif [ $bsrstat != 0 ] ; then + echo " !!!!! Volume selection error !!!!! " + echo " !!!!! Volume selection error !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== bsr-opt-test Bacula source OK ===== " diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 13176050da..f2032ef7b3 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -51,6 +51,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! compressed-test Bacula source failed!!! !!!!! " echo " !!!!! compressed-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== compressed-test Bacula source OK ===== " diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index c1861a3baf..e15c3ba3c7 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -68,6 +68,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! concurrent-jobs-test Bacula source failed!!! !!!!! " echo " !!!!! concurrent-jobs-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== concurrent-jobs-test Bacula source OK ===== " diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test index 2c27330ddc..fc1ce98c12 100755 --- a/regress/tests/decremental-test +++ b/regress/tests/decremental-test @@ -82,6 +82,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! decremental-test Bacula source failed!!! !!!!! " echo " !!!!! decremental-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== decremental-test Bacula source OK ===== " diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index 3929bb51c7..7d2d5329b0 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -79,11 +79,18 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! four-concurrent-jobs-test Bacula source failed!!! !!!!! " echo " !!!!! four-concurrent-jobs-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " exit 1 else echo " ===== four-concurrent-jobs-test Bacula source OK ===== " echo " ===== four-concurrent-jobs-test OK ===== " >>test.out - scripts/cleanup +# scripts/cleanup exit 0 fi diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index a312b386e6..2356303c2e 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -118,6 +118,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! four-jobs-test Bacula source failed!!! !!!!! " echo " !!!!! four-jobs-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== four-jobs-test Bacula source OK ===== " diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 0701cf2ba9..b740ccf0bd 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -150,6 +150,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! incremental-test Bacula source failed!!! !!!!! " echo " !!!!! incremental-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== incremental-test Bacula source OK ===== " diff --git a/regress/tests/query-test b/regress/tests/query-test index 9bec874ac3..11a88cb319 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -115,6 +115,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! query-test Bacula source failed!!! !!!!! " echo " !!!!! query-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== query-test Bacula source OK ===== " diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index aa87753624..6dbc60c5a5 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -82,6 +82,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! recycle-test Bacula source failed!!! !!!!! " echo " !!!!! recycle-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== recycle-test Bacula source OK ===== " diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index 2740ea56c6..9ee9958950 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -57,6 +57,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! restore-by-file-test Bacula source failed!!! !!!!! " echo " !!!!! restore-by-file-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== restore-by-file-test Bacula source OK ===== " diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 4a0514b669..76372a363c 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -78,6 +78,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! restore-disk-seek-test Bacula source failed!!! !!!!! " echo " !!!!! restore-disk-seek-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== restore-disk-seek-test Bacula source OK ===== " diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index 61e6dff9ef..bf55e1ae8c 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -57,6 +57,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! six-vol-test Bacula source failed!!! !!!!! " echo " !!!!! six-vol-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== six-vol-test Bacula source OK ===== " diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index e8127501ff..5136ab9a4f 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -58,6 +58,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! span-vol-test Bacula source failed!!! !!!!! " echo " !!!!! span-vol-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== span-vol-test Bacula source OK ===== " diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index 996d3ce8d1..11fc42a56a 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -47,6 +47,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! sparse-compressed-test Bacula source failed!!! !!!!! " echo " !!!!! sparse-compressed-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== sparse-compressed-test Bacula source OK ===== " diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 682fa052e6..c1c7328bd6 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -49,6 +49,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! sparse-test Bacula source failed!!! !!!!! " echo " !!!!! sparse-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== sparse-test Bacula source OK ===== " diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index aee240cfd4..e7d110bce1 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -78,6 +78,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! two-jobs-test Bacula source failed!!! !!!!! " echo " !!!!! two-jobs-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== two-jobs-test Bacula source OK ===== " diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index c7b32dc4ac..1a80133461 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -48,6 +48,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! two-vol-test Bacula source failed!!! !!!!! " echo " !!!!! two-vol-test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== two-vol-test Bacula source OK ===== " diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 9d5e13db1e..bb19632e79 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -45,6 +45,13 @@ if [ $? != 0 -o $bstat != 0 ] ; then echo " " echo " !!!!! Verify Volume failed!!! !!!!! " echo " !!!!! Verify Volume failed!!! !!!!! " >>test.out + if [ $bstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== Verify Volume Test OK ===== " diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 3f916251e7..07aaf8b806 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -67,6 +67,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! Weird files test failed!!! !!!!! " echo " !!!!! Weird files test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== Weird files test OK ===== " diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index aea5126b27..0766cc63d6 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -76,6 +76,13 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " !!!!! Weird files2 test failed!!! !!!!! " echo " !!!!! Weird files2 test failed!!! !!!!! " >>test.out + if [ $bstat != 0 -o $rstat != 0 ] ; then + echo " !!!!! Bad Job termination status !!!!! " + echo " !!!!! Bad Job termination status !!!!! " >>test.out + else + echo " !!!!! Restored files differ !!!!! " + echo " !!!!! Restored files differ !!!!! " >>test.out + fi echo " " else echo " ===== Weird files2 test OK ===== "