From: Kern Sibbald Date: Thu, 27 Dec 2012 07:38:21 +0000 (+0100) Subject: Tweak tests to work with timelimit X-Git-Tag: Release-7.0.0~43 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=09964ce0f0355205abd87ce6661688baa46659df;p=bacula%2Fbacula Tweak tests to work with timelimit --- diff --git a/regress/all-disk-tests b/regress/all-disk-tests index abc1b60154..5172595216 100755 --- a/regress/all-disk-tests +++ b/regress/all-disk-tests @@ -1,6 +1,6 @@ #!/bin/sh # -# ./run all tests +# Run all tests # echo " " echo " " >>test.out @@ -41,24 +41,15 @@ rm -f dumps/* ./run tests/regexwhere-test # The following two can uses *lots* of disk space # so they are normally turned off, but if you have -# at least two GB free, you can ./run them +# at least two GB free, you can run them #./run tests/sparse-encrypt-test #./run tests/gigaslam-sparse-test -#./run tests/delta-big-test -#./run tests/delta3-test ./run tests/differential-test ./run tests/four-concurrent-jobs-test ./run tests/four-jobs-test ./run tests/incremental-test -./run tests/opt-plugin-test -./run tests/delta2-test -./run tests/delta-options-test ./run tests/query-test ./run tests/recycle-test -./run tests/restart-job-test -./run tests/restart2-job-test -./run tests/restart2-base-job-test -./run tests/restart-accurate-job-test ./run tests/restore2-by-file-test ./run tests/restore-by-file-test ./run tests/restore-disk-seek-test @@ -78,7 +69,6 @@ rm -f dumps/* ./run tests/sparse-lzo-test ./run tests/sparse-test ./run tests/strip-test -./run tests/sqlite-test ./run tests/two-jobs-test ./run tests/two-vol-test ./run tests/verify-cat-test @@ -92,9 +82,8 @@ rm -f dumps/* ./run tests/migration-volume-test ./run tests/migration-time-test ./run tests/multi-storage-test -# prune-test does not work for now +# Disabled because certain pruning turned off #./run tests/prune-test -./run tests/prune-pool-test ./run tests/prune-config-test ./run tests/prune-migration-test ./run tests/prune-copy-test diff --git a/regress/do_all_tests b/regress/do_all_tests index 44be9b0f94..0371a517f5 100755 --- a/regress/do_all_tests +++ b/regress/do_all_tests @@ -4,6 +4,8 @@ if [ ! -f bin/tape_options ] ; then touch bin/tape_options fi echo " " >test.out +hostname >>test.out +echo " " >>test.out cat build/config.out >>test.out echo " " >>test.out echo "Test results" >>test.out @@ -16,5 +18,6 @@ echo " " echo "End do_all tests" echo "End do_all tests" >>test.out scripts/cleanup +hostname >>test.out cat test.out ./endtime