]> git.sur5r.net Git - bacula/bacula/commitdiff
Add new regression updates
authorKern Sibbald <kern@sibbald.com>
Sun, 29 Aug 2004 15:36:19 +0000 (15:36 +0000)
committerKern Sibbald <kern@sibbald.com>
Sun, 29 Aug 2004 15:36:19 +0000 (15:36 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1567 91ce42f0-d328-0410-95d8-f526ca767f89

25 files changed:
regress/run [new file with mode: 0755]
regress/tests/auto-label-test
regress/tests/backup-bacula-test
regress/tests/bextract-test
regress/tests/bscan-test
regress/tests/bsr-opt-test
regress/tests/compressed-test
regress/tests/concurrent-jobs-test
regress/tests/decremental-test
regress/tests/four-concurrent-jobs-test
regress/tests/four-jobs-test
regress/tests/incremental-test
regress/tests/query-test
regress/tests/recycle-test
regress/tests/restore-by-file-test
regress/tests/restore-disk-seek-test
regress/tests/six-vol-test
regress/tests/span-vol-test
regress/tests/sparse-compressed-test
regress/tests/sparse-test
regress/tests/two-jobs-test
regress/tests/two-vol-test
regress/tests/verify-vol-test
regress/tests/weird-files-test
regress/tests/weird-files2-test

diff --git a/regress/run b/regress/run
new file mode 100755 (executable)
index 0000000..d48e262
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+bin/bacula start
+bin/bconsole -c bin/bconsole.conf
index ef2ae58c8448b04af59ab874839bf7225e58eb5d..8558939a444acb58af5f9487d3588ca1dc484b3b 100755 (executable)
@@ -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 ===== "
index 6c52b3240c879bb0b55948228c12e7b44e8f6cb0..94843b6ae9438e9de75021414c28dcbf8f2f9b3d 100755 (executable)
@@ -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 ===== "
index e3b0f740c9259c5c2a71c343000e5d1637bc4752..1521ab67a523e176b9b7e28fd7d8042cbf25d08a 100755 (executable)
@@ -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 ===== "
index a55851c58d4cf4967cc466ca20bfa7a161c21f98..310a1806c182b4a6b87113e21b7233e870051683 100755 (executable)
@@ -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
index 7736ae1006c47a6b235cee35f9c5f149c947f7bf..74002e23a4b3433338d6abe6f9569fd0dc0a7085 100755 (executable)
@@ -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 ===== "
index 13176050da8d21d1608064c6edc2f328409ea937..f2032ef7b34e30a74ec71432d2b3f4f324b4873a 100755 (executable)
@@ -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 ===== "
index c1861a3baf8d6c773ad48d9bced69f95945fec21..e15c3ba3c7e7348cc566c0b5904c4e63a1636c76 100755 (executable)
@@ -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 ===== "
index 2c27330ddc3946a5050f0aea9f038a3ac76c68aa..fc1ce98c12cd40409a7c71502c05b285bb3891a6 100755 (executable)
@@ -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 ===== "
index 3929bb51c78d35f94f20f41dadd9067c450a6209..7d2d5329b0dbaa393fc060deeb28f862cfd60654 100755 (executable)
@@ -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
index a312b386e6b1c9ac10bb55f43905ff6c1db9b2e9..2356303c2e9979cdef5985550a9c5c7b64ba1819 100755 (executable)
@@ -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 ===== "
index 0701cf2ba933ca32b8949fa30577f39c58f44d17..b740ccf0bdb0ace02390341ebdbae32667dfd10a 100755 (executable)
@@ -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 ===== "
index 9bec874ac30740b549f383ce460954564403373c..11a88cb31936462e469e0794d516dbe6e81702f6 100755 (executable)
@@ -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 ===== "
index aa877536244bb6967cb1c714e9404524d5434e69..6dbc60c5a51548a491d928ad98c399464b1ecef7 100755 (executable)
@@ -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 ===== "
index 2740ea56c6285c1df76f02327afcadbdb0924d5d..9ee99589504d999fccd935ec4b056e07ac8d3de9 100755 (executable)
@@ -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 ===== "
index 4a0514b669f3c97b366b9a249e1e9223ece1c79b..76372a363c5734810819a3a41b61c894c3c1831c 100755 (executable)
@@ -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 ===== "
index 61e6dff9efd4c4bd41ea20dff63e12f16b6f9bdb..bf55e1ae8ce35b13a6636f6f6f9ce3c8f914060e 100755 (executable)
@@ -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 ===== "
index e8127501ff8f3f46934a1eb4a01e306a3231ef52..5136ab9a4f84df526ff7ebb4666793f8d2a3915d 100755 (executable)
@@ -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 ===== "
index 996d3ce8d12503399ca263697400c48b64092a39..11fc42a56a9ec34639f2e58409488f1c3caff05c 100755 (executable)
@@ -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 ===== "
index 682fa052e64f90ee13217f20f4aa7a7e92b9c6e9..c1c7328bd62b12803e0df32bc0ddcd48d32df56c 100755 (executable)
@@ -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 ===== "
index aee240cfd4d61c46ba589ea784a668d940fe514e..e7d110bce1bb3bcef00c9ec9bbed0512ed4f4159 100755 (executable)
@@ -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 ===== "
index c7b32dc4acb277498a61add4321fd2dd00bb0429..1a8013346198dbecb70ad78697c494f936e4a532 100755 (executable)
@@ -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 ===== "
index 9d5e13db1ecb56f10a9f43030d4ef36e96944e34..bb19632e79478128dc422dae908bb0c1df202148 100755 (executable)
@@ -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 ===== "
index 3f916251e7641c548c0045dce390a723e3754654..07aaf8b806b5784fb4c9dfc1b8d98fc838c37ab7 100755 (executable)
@@ -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 ===== "
index aea5126b27e34eb55ab775d01685ad1b3e25b3cd..0766cc63d60dceba3a073a42424aa8c27b8da2ca 100755 (executable)
@@ -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 ===== "