fix test

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index d6a8bfc0bd10f99c7e01faee207193ac13eae16d..110d8d8f61187ae5022bc5e005bde116b8fb0b03 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -16,7 +16,7 @@ nice tests/concurrent-jobs-test
 nice tests/data-encrypt-test
 nice tests/encrypt-bug-test
 nice tests/fifo-test
-nice tests/backup-bacula-fifo
+nice tests/backup-to-null
 nice tests/regexwhere-test
 # The following two can uses *lots* of disk space
 #   so they are normally turned off, but if you have

diff --git a/regress/tests/backup-bacula-fifo b/regress/tests/backup-bacula-fifo
deleted file mode 100755 (executable)
index b650807..0000000
--- a/regress/tests/backup-bacula-fifo
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# Run a simple backup of the Bacula build directory 
-#   to a tape then restore it, we do that twice to ensure that
-#   we can correctly append to a tape.
-# We also use the purge and the relabel commands as
-#   well as a pile of status storage commands.
-#
-TestName="backup-bacula-fifo"
-JobName=backupfifo
-. scripts/functions
-set_debug 1
-
-cwd=`pwd`
-scripts/cleanup
-scripts/copy-fifo-confs
-
-echo "${cwd}/build" >/tmp/file-list
-
-change_jobname NightlySave $JobName
-rm -f tmp/log1.out tmp/log2.out
-start_test
-
-
-# Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
-messages
-@$out tmp/log1.out
-@#setdebug level=200 storage=Dummy
-label storage=Dummy volume=TestVolume001 slot=0 pool=Default
-run job=$JobName yes
-status storage=Dummy
-@sleep 1
-wait
-@sleep 3
-messages
-quit
-END_OF_DATA
-
-run_bacula
-check_for_zombie_jobs storage=Dummy
-stop_bacula
-
-#
-# Now do a second backup after making a few changes
-#
-touch ${cwd}/build/src/dird/*.c
-echo "test test" > ${cwd}/build/src/dird/xxx
-
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
-messages
-@$out tmp/log2.out
-list volumes
-run job=$JobName yes
-wait
-list volumes
-@sleep 3
-messages
-quit
-END_OF_DATA
-
-run_bacula
-check_for_zombie_jobs storage=Dummy
-stop_bacula
-
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
-bstat=$?
-grep "^  Termination: *Backup OK" tmp/log2.out 2>&1 >/dev/null
-dstat=$?
-
-# not yet implemented
-rstat=0
-
-end_test

diff --git a/regress/tests/backup-to-null b/regress/tests/backup-to-null
new file mode 100755 (executable)
index 0000000..3f3df21
--- /dev/null
+++ b/regress/tests/backup-to-null
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory 
+#   to a tape then restore it, we do that twice to ensure that
+#   we can correctly append to a tape.
+# We also use the purge and the relabel commands as
+#   well as a pile of status storage commands.
+#
+TestName="backup-to-null"
+JobName=backuptonull
+. scripts/functions
+set_debug 0
+
+cwd=`pwd`
+scripts/cleanup
+scripts/copy-fifo-confs
+
+echo "${cwd}/build" >/tmp/file-list
+
+change_jobname NightlySave $JobName
+rm -f tmp/log1.out tmp/log2.out
+start_test
+
+
+# Write out bconsole commands
+cat <<END_OF_DATA >tmp/bconcmds
+@output /dev/null
+messages
+@$out tmp/log1.out
+@#setdebug level=200 storage=Dummy
+label storage=Dummy volume=TestVolume001 slot=0 pool=Default
+run job=$JobName yes
+status storage=Dummy
+@sleep 1
+wait
+@sleep 3
+messages
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=Dummy
+stop_bacula
+
+#
+# Now do a second backup after making a few changes
+#
+touch ${cwd}/build/src/dird/*.c
+echo "test test" > ${cwd}/build/src/dird/xxx
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@$out tmp/log2.out
+list volumes
+run job=$JobName yes
+wait
+list volumes
+@sleep 3
+messages
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=Dummy
+stop_bacula
+
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+grep "^  Termination: *Backup OK" tmp/log2.out 2>&1 >/dev/null
+dstat=$?
+
+# not yet implemented
+rstat=0
+
+end_test