more mkdir -p changes

[bacula/bacula] / regress / tests / ansi-label-tape

diff --git a/regress/tests/ansi-label-tape b/regress/tests/ansi-label-tape
index 4bd763bf8735f214c2f4e678e49e2ed765eee4a8..ad9ab4451547b50fc076683b225744190f75acf1 100755 (executable)
--- a/regress/tests/ansi-label-tape
+++ b/regress/tests/ansi-label-tape
@@ -25,17 +25,17 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-@#setdebug level=200 storage=DDS-4
-label storage=DDS-4 volume=Vol001 slot=0 pool=Default
+setdebug level=200 storage=tape
+label storage=tape volume=Vol001 slot=0 pool=Default
 purge volume=Vol001
-relabel pool=Default storage=DDS-4 oldVolume=Vol001 volume=Vol002 slot=0
+relabel pool=Default storage=tape oldVolume=Vol001 volume=Vol002 slot=0
 purge volume=Vol002
-relabel pool=Default storage=DDS-4 oldVolume=Vol002 volume=Vol001 slot=0
+relabel pool=Default storage=tape oldVolume=Vol002 volume=Vol001 slot=0
 run job=$JobName yes
-status storage=DDS-4
+status storage=tape
 @sleep 1
 wait
 messages
@@ -43,7 +43,8 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+setdebug level=200 storage=tape
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 list volumes
@@ -51,7 +52,7 @@ messages
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 #
@@ -65,7 +66,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 list volumes
-@#setdebug level=300 storage=DDS-4
+@#setdebug level=300 storage=tape
 run job=$JobName yes
 wait
 list volumes
@@ -75,17 +76,16 @@ messages
 @#
 @$out ${cwd}/tmp/log2.out
 list volumes
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 list volumes
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs