From 746d82a8a9073a8f8093fa611d02cddc192f8936 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 28 Mar 2006 20:51:04 +0000 Subject: [PATCH] Updates git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2870 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/Makefile.in | 2 +- regress/all-non-root-tests | 1 + regress/tests/auto-label-test | 4 ++-- regress/tests/backup-bacula-test | 4 ++-- regress/tests/bextract-test | 4 ++-- regress/tests/bscan-test | 6 +++--- regress/tests/bsr-opt-test | 4 ++-- regress/tests/compressed-test | 4 ++-- regress/tests/concurrent-jobs-test | 5 ++--- regress/tests/differential-test | 4 ++-- regress/tests/filed-crypto-test | 4 ++-- regress/tests/four-concurrent-jobs-test | 6 +++--- regress/tests/four-jobs-test | 4 ++-- regress/tests/incremental-test | 4 ++-- regress/tests/query-test | 4 ++-- regress/tests/recycle-test | 4 ++-- regress/tests/restore-by-file-test | 4 ++-- regress/tests/restore-disk-seek-test | 8 ++++---- regress/tests/restore2-by-file-test | 4 ++-- regress/tests/scratch-pool-test | 6 +++--- regress/tests/six-vol-test | 4 ++-- regress/tests/span-vol-test | 4 ++-- regress/tests/sparse-compressed-test | 4 ++-- regress/tests/sparse-test | 4 ++-- regress/tests/two-jobs-test | 4 ++-- regress/tests/two-pool-test | 6 +++--- regress/tests/two-vol-test | 4 ++-- regress/tests/two-volume-test | 6 +++--- regress/tests/verify-vol-test | 4 ++-- regress/tests/weird-files-test | 4 ++-- regress/tests/weird-files2-test | 4 ++-- 31 files changed, 67 insertions(+), 67 deletions(-) diff --git a/regress/Makefile.in b/regress/Makefile.in index b1fc696d4f..535c3722cf 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -53,7 +53,7 @@ root_test: clean: scripts/cleanup rm -f /tmp/file-list - rm -f tmp/* working/* + rm -fr tmp/* working/* rm -f test.out rm -f diff rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3 diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests index 1438441cb5..cf8213d84b 100755 --- a/regress/all-non-root-tests +++ b/regress/all-non-root-tests @@ -2,6 +2,7 @@ # # Run all tests # +rm -f test1.out tests/test0 echo " " tests/auto-label-test diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test index 89f368207e..b8a74b0bca 100755 --- a/regress/tests/auto-label-test +++ b/regress/tests/auto-label-test @@ -91,7 +91,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== auto-label-test OK ===== " - echo " ===== auto-label-test OK ===== " >>test.out + echo " ===== auto-label-test OK `date +%R:%S` ===== " + echo " ===== auto-label-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index cf372872a2..b924881e68 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -89,7 +89,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== Backup Bacula Test OK ===== " - echo " ===== Backup Bacula Test OK ===== " >>test.out + echo " ===== Backup Bacula Test OK `date +%R:%S` ===== " + echo " ===== Backup Bacula Test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index a07b387a2f..c07fec39da 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -73,7 +73,7 @@ if [ $? != 0 -o $bstat != 0 ] ; then fi echo " " else - echo " ===== bextract-test Bacula source OK ===== " - echo " ===== bextract-test OK ===== " >>test.out + echo " ===== bextract-test Bacula source OK `date +%R:%S` ===== " + echo " ===== bextract-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 3e854da219..92c01ae516 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -117,7 +117,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== bscan-test Bacula source OK ===== " - echo " ===== bscan-test OK ===== " >>test.out -# scripts/cleanup + echo " ===== bscan-test Bacula source OK `date +%R:%S` ===== " + echo " ===== bscan-test OK `date +%R:%S` ===== " >>test.out + scripts/cleanup fi diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index e2bf556bee..c812613610 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -90,7 +90,7 @@ if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== bsr-opt-test Bacula source OK ===== " - echo " ===== bsr-opt-test OK ===== " >>test.out + echo " ===== bsr-opt-test Bacula source OK `date +%R:%S` ===== " + echo " ===== bsr-opt-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index c373a58785..c1e4cf161a 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -61,7 +61,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== compressed-test Bacula source OK ===== " - echo " ===== compressed-test OK ===== " >>test.out + echo " ===== compressed-test Bacula source OK `date +%R:%S` ===== " + echo " ===== compressed-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index dafddc5880..4d2ffa234c 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -26,7 +26,6 @@ echo "largefile created" echo " " echo " " 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 @@ -77,7 +76,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== concurrent-jobs-test Bacula source OK ===== " - echo " ===== concurrent-jobs-test OK ===== " >>test.out + echo " ===== concurrent-jobs-test Bacula source OK `date +%R:%S` ===== " + echo " ===== concurrent-jobs-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/differential-test b/regress/tests/differential-test index 3182e98cb7..e758454558 100755 --- a/regress/tests/differential-test +++ b/regress/tests/differential-test @@ -122,7 +122,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== differential-test Bacula source OK ===== " - echo " ===== differential-test OK ===== " >>test.out + echo " ===== differential-test Bacula source OK `date +%R:%S` ===== " + echo " ===== differential-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/filed-crypto-test b/regress/tests/filed-crypto-test index 8cf9eb39cf..7f816eeb2a 100755 --- a/regress/tests/filed-crypto-test +++ b/regress/tests/filed-crypto-test @@ -73,7 +73,7 @@ if [ $? != 0 -o $bstat != 0 ] ; then fi echo " " else - echo " ===== Filed Encryption Verification Test OK ===== " - echo " ===== Filed Encryption Verification Test OK ===== " >>test.out + echo " ===== Filed Encryption Verification Test OK `date +%R:%S` ===== " + echo " ===== Filed Encryption Verification Test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index 95d1368525..f1174b4b17 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -89,8 +89,8 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " exit 1 else - echo " ===== four-concurrent-jobs-test Bacula source OK ===== " - echo " ===== four-concurrent-jobs-test OK ===== " >>test.out -# scripts/cleanup + echo " ===== four-concurrent-jobs-test Bacula source OK `date +%R:%S` ===== " + echo " ===== four-concurrent-jobs-test OK `date +%R:%S` ===== " >>test.out + scripts/cleanup exit 0 fi diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 828cc7cc04..0dcfd1b880 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -170,7 +170,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== four-jobs-test Bacula source OK ===== " - echo " ===== four-jobs-test OK ===== " >>test.out + echo " ===== four-jobs-test Bacula source OK `date +%R:%S` ===== " + echo " ===== four-jobs-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index b7345e95d3..6449eef6c5 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -159,7 +159,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== incremental-test Bacula source OK ===== " - echo " ===== incremental-test OK ===== " >>test.out + echo " ===== incremental-test Bacula source OK `date +%R:%S` ===== " + echo " ===== incremental-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/query-test b/regress/tests/query-test index 20c459e62a..b3a8f3c19f 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -124,7 +124,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== query-test Bacula source OK ===== " - echo " ===== query-test OK ===== " >>test.out + echo " ===== query-test Bacula source OK `date +%R:%S` ===== " + echo " ===== query-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index fd1c383d84..57a499714a 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -92,7 +92,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== recycle-test Bacula source OK ===== " - echo " ===== recycle-test OK ===== " >>test.out + echo " ===== recycle-test Bacula source OK `date +%R:%S` ===== " + echo " ===== recycle-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index f762b48324..c1d81194b5 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -81,7 +81,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== restore-by-file-test Bacula source OK ===== " - echo " ===== restore-by-file-test OK ===== " >>test.out + echo " ===== restore-by-file-test Bacula source OK `date +%R:%S` ===== " + echo " ===== restore-by-file-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 9dd157abc2..4b2c028c69 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -102,8 +102,8 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== restore-disk-seek-test Bacula source OK ===== " - echo " ===== restore-disk-seek-test OK ===== " >>test.out -# scripts/cleanup -# rm -rf ${cwd}/tmp/build + echo " ===== restore-disk-seek-test Bacula source OK `date +%R:%S` ===== " + echo " ===== restore-disk-seek-test OK `date +%R:%S` ===== " >>test.out + scripts/cleanup + rm -rf ${cwd}/tmp/build fi diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index cfbf2cbc83..357ecc2531 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -59,7 +59,7 @@ if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo "Diff status = $dstat" echo " " else - echo " ===== restore2-by-file-test Bacula source OK ===== " - echo " ===== restore2-by-file-test OK ===== " >>test.out + echo " ===== restore2-by-file-test Bacula source OK `date +%R:%S` ===== " + echo " ===== restore2-by-file-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test index 1aee8fe123..813f007957 100755 --- a/regress/tests/scratch-pool-test +++ b/regress/tests/scratch-pool-test @@ -87,7 +87,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " !!!!! Scratch Pool Test failed!!! !!!!! " >>test.out echo " " else - echo " ===== Scratch Pool Test Bacula source OK ===== " - echo " ===== Scratch Pool Test OK ===== " >>test.out -# scripts/cleanup + echo " ===== Scratch Pool Test Bacula source OK `date +%R:%S` ===== " + echo " ===== Scratch Pool Test OK `date +%R:%S` ===== " >>test.out + scripts/cleanup fi diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index bdf6f846dc..0c709f095e 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -66,7 +66,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== six-vol-test Bacula source OK ===== " - echo " ===== six-vol-test OK ===== " >>test.out + echo " ===== six-vol-test Bacula source OK `date +%R:%S` ===== " + echo " ===== six-vol-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index dd9f08d9fd..da8a730d5b 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -82,7 +82,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== span-vol-test Bacula source OK ===== " - echo " ===== span-vol-test OK ===== " >>test.out + echo " ===== span-vol-test Bacula source OK `date +%R:%S` ===== " + echo " ===== span-vol-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index dde29ece61..a4d40e1924 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -56,7 +56,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== sparse-compressed-test Bacula source OK ===== " - echo " ===== sparse-compressed-test OK ===== " >>test.out + echo " ===== sparse-compressed-test Bacula source OK `date +%R:%S` ===== " + echo " ===== sparse-compressed-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 0e01188d6c..5122fdd805 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -58,7 +58,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== sparse-test Bacula source OK ===== " - echo " ===== sparse-test OK ===== " >>test.out + echo " ===== sparse-test Bacula source OK `date +%R:%S` ===== " + echo " ===== sparse-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index 8768362464..af4c38d7c5 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -87,7 +87,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== two-jobs-test Bacula source OK ===== " - echo " ===== two-jobs-test OK ===== " >>test.out + echo " ===== two-jobs-test Bacula source OK `date +%R:%S` ===== " + echo " ===== two-jobs-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test index 9686b42566..3b3fb5eb53 100755 --- a/regress/tests/two-pool-test +++ b/regress/tests/two-pool-test @@ -100,7 +100,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " !!!!! Two Pool Test failed!!! !!!!! " >>test.out echo " " else - echo " ===== Two Pool Test Bacula source OK ===== " - echo " ===== Two Pool Test OK ===== " >>test.out -# scripts/cleanup + echo " ===== Two Pool Test Bacula source OK `date +%R:%S` ===== " + echo " ===== Two Pool Test OK `date +%R:%S` ===== " >>test.out + scripts/cleanup fi diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 876b8fa011..967cc95936 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -72,7 +72,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== two-vol-test Bacula source OK ===== " - echo " ===== two-vol-test OK ===== " >>test.out + echo " ===== two-vol-test Bacula source OK `date +%R:%S` ===== " + echo " ===== two-vol-test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index 55b3bba6cd..8d08325790 100755 --- a/regress/tests/two-volume-test +++ b/regress/tests/two-volume-test @@ -81,7 +81,7 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " !!!!! Two Volume Test failed!!! !!!!! " >>test.out echo " " else - echo " ===== Two Volume Test Bacula source OK ===== " - echo " ===== Two Volume Test OK ===== " >>test.out -# scripts/cleanup + echo " ===== Two Volume Test Bacula source OK `date +%R:%S` ===== " + echo " ===== Two Volume Test OK `date +%R:%S` ===== " >>test.out + scripts/cleanup fi diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 2df75d62f8..c7b0cb247a 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -70,7 +70,7 @@ if [ $? != 0 -o $bstat != 0 ] ; then fi echo " " else - echo " ===== Verify Volume Test OK ===== " - echo " ===== Verify Volume Test OK ===== " >>test.out + echo " ===== Verify Volume Test OK `date +%R:%S` ===== " + echo " ===== Verify Volume Test OK `date +%R:%S` ===== " >>test.out scripts/cleanup fi diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 5c1f44793e..e508e7fb52 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -88,8 +88,8 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== Weird files test OK ===== " - echo " ===== Weird files test OK ===== " >>test.out + echo " ===== Weird files test OK `date +%R:%S` ===== " + echo " ===== Weird files test OK `date +%R:%S` ===== " >>test.out cd ${cwd} scripts/cleanup fi diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index fe5a50c972..b99a4c540b 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -104,8 +104,8 @@ if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then fi echo " " else - echo " ===== Weird files2 test OK ===== " - echo " ===== Weird files2 test OK ===== " >>test.out + echo " ===== Weird files2 test OK `date +%R:%S` ===== " + echo " ===== Weird files2 test OK `date +%R:%S` ===== " >>test.out cd ${cwd} scripts/cleanup rm -rf weird-files2 -- 2.39.5