From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 4 Jan 2008 16:33:50 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~5181
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0a862bb30a993f297aa3152a38d58f934da84d16;p=bacula%2Fbacula

Update

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

diff --git a/regress/tests/four-concurrent-jobs-1t1d-tape b/regress/tests/four-concurrent-jobs-1t1d-tape
new file mode 100755
index 0000000000..738d8178ae
--- /dev/null
+++ b/regress/tests/four-concurrent-jobs-1t1d-tape
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Run four jobs at the same time
+#
+TestName="four-concurrent-jobs-1t1d-tape"
+JobName=FourConcurrentJobs
+. scripts/functions
+
+scripts/cleanup-tape
+scripts/copy-tape-confs
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+change_jobname $JobName
+start_test
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
+run job=$JobName level=Full Storage=DDS-4 yes
+run job=$JobName level=Full Storage=DDS-4 yes
+run job=$JobName level=Full Storage=DDS-4 yes
+run job=$JobName level=Full Storage=DDS-4 yes
+@sleep 2
+status dir
+@sleep 5
+status dir
+status storage=DDS-4
+messages
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+unmark *
+mark *
+done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test
diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
deleted file mode 100755
index 738d8178ae..0000000000
--- a/regress/tests/four-concurrent-jobs-tape
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# Run four jobs at the same time
-#
-TestName="four-concurrent-jobs-1t1d-tape"
-JobName=FourConcurrentJobs
-. scripts/functions
-
-scripts/cleanup-tape
-scripts/copy-tape-confs
-
-echo "${cwd}/build" >${cwd}/tmp/file-list
-
-change_jobname $JobName
-start_test
-
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
-messages
-@$out ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-run job=$JobName level=Full Storage=DDS-4 yes
-run job=$JobName level=Full Storage=DDS-4 yes
-run job=$JobName level=Full Storage=DDS-4 yes
-run job=$JobName level=Full Storage=DDS-4 yes
-@sleep 2
-status dir
-@sleep 5
-status dir
-status storage=DDS-4
-messages
-wait
-messages
-@# 
-@# now do a restore
-@#
-@$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
-unmark *
-mark *
-done
-yes
-wait
-messages
-@$out
-quit
-END_OF_DATA
-
-run_bacula
-check_for_zombie_jobs storage=DDS-4
-stop_bacula
-
-check_two_logs
-check_restore_diff
-end_test