Remove bashism in script

[bacula/bacula] / regress / tests / incremental-tape

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 263d9da6fe8a616a87237bcd957d4574f904cd0a..38e8347b681fdff93f302c9859368cae22a5936e 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -6,11 +6,13 @@
 TestName="incremental-tape"
 JobName=IncTape
 . scripts/functions
-set_debug 0
+
+require_tape_drive
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
-echo "${cwd}/tmp/build" >/tmp/file-list
+
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
    mkdir ${cwd}/tmp/build
 fi
@@ -20,13 +22,13 @@ echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
 echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 cd ${cwd}
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=$JobName yes
 wait
@@ -34,22 +36,23 @@ messages
 quit
 END_OF_DATA
 
-scripts/check_for_zombie_jobs storage=DDS-4
+run_bacula
+check_for_zombie_jobs storage=DDS-4
 
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out   tmp/log1.out
+@$out   ${cwd}/tmp/log1.out
 run level=Incremental job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
+@$out   ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=DDS-4
 7
 <${cwd}/tmp/restore-list
@@ -61,14 +64,14 @@ messages
 quit
 END_OF_DATA
 
-run_bacula
+run_bconsole
 check_for_zombie_jobs storage=DDS-4
 stop_bacula
 
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 
 check_two_logs
 check_restore_tmp_build_diff