Fix regression minor scripting problems

[bacula/bacula] / regress / tests / six-vol-test

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index a925ff94e56281f15ed059c56b50b33249172c4c..32b8a27df37e5ac55fb3336ae359ac78246ba69c 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Create a 60MB file with random bytes. Back it up to 6 Volumes
 #   each constrained to 10MB using the automatic labeling feature.
@@ -17,20 +22,20 @@ scripts/copy-testa-confs
 # copy special conf file
 /bin/cp -f scripts/testb-bacula-dir.conf bin/bacula-dir.conf
 
-echo "${cwd}/tmp/largefile" >/tmp/file-list
+echo "${cwd}/tmp/largefile" >${cwd}/tmp/file-list
 # Create 56MB file with random data
 echo "Creating a 56MB file with random data ..."
-dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
+dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 >/dev/null 2>&1
 echo "largefile created"
 
 change_jobname MultiVol $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-@#setdebug level=50 storage=File
+@$out ${cwd}/tmp/log1.out
+setdebug level=50 storage=File
 run job=$JobName storage=File yes
 run job=$JobName storage=File yes
 run job=$JobName storage=File yes
@@ -42,12 +47,12 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 sql
 select * from JobMedia where JobId=4;
 select * from JobMedia where JobId=5;
 
-@#setdebug level=50 storage=File
+setdebug level=50 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -55,7 +60,6 @@ done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -64,6 +68,7 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 check_two_logs
-diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+#diff ${cwd}/tmp/largefile  ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+diff ${cwd}/tmp/largefile  ${cwd}/tmp/bacula-restores${cwd}/tmp/largefile
 dstat=$?
 end_test