Add execute bit to systemstate test

[bacula/bacula] / regress / tests / 2drive-2disk

diff --git a/regress/tests/2drive-2disk b/regress/tests/2drive-2disk
index 103768afde3b0af0fc7744d6926aaddc2c4a267d..20e2b478fdeaa8afd36abd2188b59ee5b4d9f6c6 100755 (executable)
--- a/regress/tests/2drive-2disk
+++ b/regress/tests/2drive-2disk
@@ -11,7 +11,9 @@ JobName="2drive2disk"
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
+
+CLIENT=2drive2disk
 
 change_jobname localhost-fd $JobName
 start_test
@@ -28,16 +30,16 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # 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=3 dir
-setdebug level=3 storage=DDS-4
-setdebug level=3 client
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=1
-# label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
-status storage=DDS-4
-setdebug level=120 storage=DDS-4
+setdebug level=3 storage=tape
+setdebug level=3 client=$CLIENT
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=1
+# label storage=tape volume=TestVolume002 slot=2 Pool=Default drive=1
+status storage=tape
+setdebug level=120 storage=tape
 run job=NightlySave level=Full yes
 @sleep 1
 run job=NightlySave level=Full yes
@@ -48,11 +50,11 @@ run job=NightlySave level=Full yes
 @sleep 1
 run job=NightlySave level=Full yes
 @sleep 3
-status storage=DDS-4
+status storage=tape
 wait
 list volumes
 list jobs
-status storage=DDS-4
+status storage=tape
 messages
 quit
 END_OF_DATA
@@ -65,27 +67,27 @@ messages
 @$out ${cwd}/tmp/log1.out
 @# Force Incremental on the second Volume
 # update volume=TestVolume001 VolStatus=Used
-status storage=DDS-4
-@#setdebug level=120 storage=DDS-4
+status storage=tape
+@#setdebug level=120 storage=tape
 run level=Incremental job=NightlySave yes
 wait
 list volumes
-status storage=DDS-4
+status storage=tape
 messages
 @# 
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-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
 messages
-@$out
+@output
 quit
 END_OF_DATA
 
 run_bconsole
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs