Update test

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@686 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests
new file mode 100755 (executable)
index 0000000..99a97e5
--- /dev/null
+++ b/regress/all-tape-and-file-tests
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Run all tests
+#
+tests/test0
+tests/backup-bacula-test
+tests/verify-vol-test
+tests/sparse-test
+tests/compressed-test
+tests/sparse-compressed-test
+tests/wierd-files-test
+tests/two-jobs-test
+tests/two-vol-test
+tests/six-vol-test
+tests/bscan-test
+tests/wierd-files2-test
+tests/concurrent-jobs-test
+tests/four-concurrent-jobs-test
+tests/bsr-opt-test
+tests/bextract-test
+tests/recycle-test
+tests/span-vol-test
+tests/backup-bacula-tape
+tests/small-file-size-tape
+tests/two-volume-tape
+echo " "
+echo " "
+echo "Test results"
+cat test.out
+scripts/cleanup

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index a203cd0b94c07e3baadaef892796d208283f86af..f163887039019b84b41d4cc08ce2c18985d3cfd6 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -21,10 +21,8 @@ bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
-label
-TestVolume001
-run job=Client1
-yes
+label volume=TestVolume001
+run job=Client1 yes
 wait
 messages
 @# 
@@ -33,7 +31,6 @@ messages
 @output tmp/log2.out  
 restore current all
 yes
-@sleep 1
 wait
 messages
 @output