From 62285e850aec6dba6cdb3491d84aeeac5131a382 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 10 Aug 2007 12:19:53 +0000
Subject: [PATCH] Update control scripts

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5330 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/all-non-root-2tape-tests | 11 ++++-------
 regress/all-non-root-tape-tests  | 14 ++++++--------
 regress/all-non-root-tests       | 19 ++++++++++++-------
 regress/all-root-tests           | 10 ++++++----
 regress/all-tape-and-file-tests  |  1 -
 regress/all-tests                |  3 ---
 regress/do_all_tests             | 12 +++++++++++-
 regress/do_file                  | 10 ++++++++++
 8 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/regress/all-non-root-2tape-tests b/regress/all-non-root-2tape-tests
index 7ba487c6ca..9491417f1b 100755
--- a/regress/all-non-root-2tape-tests
+++ b/regress/all-non-root-2tape-tests
@@ -2,12 +2,9 @@
 #
 # Run all tape tests
 #
-nice tests/test0
+echo "Start two tape tests"
+echo "Start two tape tests" >>test.out
 nice tests/two-volume-tape
 nice tests/incremental-2tape
-echo " "
-echo " "
-echo "2 Tape Test results"
-cat build/config.out
-cat test.out
-scripts/cleanup
+echo "End two tape tests"
+echo "End two tape tests" >>test.out
diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 9da64c0e57..68feb8c575 100755
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -6,8 +6,10 @@
 if test ! x$AUTOCHANGER = x/dev/null ; then
    mtx -f $AUTOCHANGER load 1 >/dev/null &2>/dev/null
 fi
-cp test.out test1.out
-nice tests/test0
+echo " "
+echo " " >>test.out
+echo "Start all non-root tape tests"
+echo "Start all non-root tape tests" >>test.out
 nice tests/backup-bacula-tape
 nice tests/btape-fill-tape
 nice tests/fixed-block-size-tape
@@ -22,9 +24,5 @@ nice tests/two-pool-tape
 nice tests/2drive-incremental-2tape
 nice tests/bscan-tape
 nice tests/verify-vol-tape
-echo " "
-echo " "
-echo "Test results"
-cat build/config.out
-cat test.out
-scripts/cleanup
+echo "End all non-root tape tests"
+echo "End all non-root tape tests" >>test.out
diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 58a48c0e44..92a96cd23e 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -2,9 +2,10 @@
 #
 # Run all tests
 #
-rm -f test1.out
-tests/test0
 echo " "
+echo " " >>test.out
+echo "Start non-root disk tests"
+echo "Start non-root disk tests" >>test.out
 nice tests/auto-label-test
 nice tests/backup-bacula-test
 nice tests/bextract-test
@@ -50,8 +51,15 @@ nice tests/migration-volume-test
 nice tests/migration-time-test
 nice tests/hardlink-test
 nice tests/tls-test
+echo "End non-root disk tests"
+echo "End non-root disk tests" >>test.out
+
 # 
 # The following are Virtual Disk Autochanger tests
+echo " "
+echo " " >>test.out
+echo "Start non-root virtual disk autochanger tests"
+echo "Start non-root virtual disk autochangertests" >>test.out
 #nice tests/three-pool-recycle-test
 nice tests/two-pool-test
 nice tests/fast-two-pool-test
@@ -63,8 +71,5 @@ nice tests/2drive-concurrent-test
 nice tests/incremental-2media
 nice tests/three-pool-test
 nice tests/2drive-3pool-test
-echo " "
-echo "Test results"
-cat build/config.out
-cat test.out
-scripts/cleanup
+echo "End non-root virtual disk autochanger tests"
+echo "End non-root virtual disk autochangertests" >>test.out
diff --git a/regress/all-root-tests b/regress/all-root-tests
index 3608461eda..1ba54d9f4a 100755
--- a/regress/all-root-tests
+++ b/regress/all-root-tests
@@ -2,11 +2,13 @@
 #
 # Run all root tests
 #
-rm -f test.out
+echo " "
+echo " " >>test.out
+echo "Start root tests"
+echo "Start root tests" >>test.out
 tests/dev-test-root
 tests/etc-test-root
 tests/lib-test-root
 tests/usr-tape-root
-cat build/config.out
-cat test.out
-scripts/cleanup
+echo "End root tests"
+echo "End root tests" >>test.out
diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests
index f3e726914a..9bc3e7676c 100755
--- a/regress/all-tape-and-file-tests
+++ b/regress/all-tape-and-file-tests
@@ -3,5 +3,4 @@
 # Run all tests
 #
 ./all-non-root-tests
-./endtime
 ./all-non-root-tape-tests
diff --git a/regress/all-tests b/regress/all-tests
index 410b4e8baa..e3dc688c87 100755
--- a/regress/all-tests
+++ b/regress/all-tests
@@ -4,6 +4,3 @@
 #
 ./all-non-root-tests
 ./all-root-tests
-cat build/config.out
-cat test.out
-scripts/cleanup
diff --git a/regress/do_all_tests b/regress/do_all_tests
index 9f05421c5f..76d4bc3c71 100755
--- a/regress/do_all_tests
+++ b/regress/do_all_tests
@@ -3,8 +3,18 @@
 if [ ! -f bin/tape_options ] ; then
   touch bin/tape_options
 fi
+echo " " >test.out
+cat build/config.out >>test.out
+echo " " >>test.out
+echo "Test results" >>test.out
+echo " " >>test.out
+./starttime
 nice ./all-non-root-tests
-
 nice ./all-non-root-tape-tests
 nice ./all-non-root-2tape-tests
+echo " "
+echo "End do_all tests"
+echo "End do_all tests" >>test.out
+scripts/cleanup
+cat test.out
 ./endtime
diff --git a/regress/do_file b/regress/do_file
index c4c5b1a07b..0ac4aa8bf3 100755
--- a/regress/do_file
+++ b/regress/do_file
@@ -1,6 +1,16 @@
 #!/bin/sh
 #  /home/kern/bacula/bin/startmysql
 nice make setup
+echo " " >test.out
+cat build/config.out >>test.out
+echo " " >>test.out
+echo "Test results" >>test.out
+echo " " >>test.out
 ./starttime
 nice ./all-non-root-tests
+echo " "
+echo "End do_file tests"
+echo "End do_file tests" >>test.out
+scripts/cleanup
+cat test.out
 ./endtime
-- 
2.39.5