Tweak remove unused regression tests + add some new ones

[bacula/bacula] / regress / tests / incremental-2media

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index c476b16819f03d4ba56dbe18099b1444bdf66dd7..a2d162d0e403f432a8a85a5cddf80a39f7e24fe1 100755 (executable)
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental onto a different medium 
@@ -10,22 +15,21 @@ TestName="incremental-2media"
 JobName=Inc2media
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+scripts/prepare-disk-changer
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName
 start_test
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
+@$out ${cwd}/tmp/log1.out
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=File volume=TestVolume002 Pool=Default
 run job=$JobName yes
 wait
@@ -35,15 +39,14 @@ END_OF_DATA
 
 run_bacula
 
-echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 setdebug level=51 storage=File
@@ -53,13 +56,16 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-setdebug level=51 storage=DDS-4
+@$out ${cwd}/tmp/log2.out
+setdebug level=151 storage=tape
+restore where=${cwd}/tmp/bacula-restores select all done 
+yes
+wait
 restore where=${cwd}/tmp/bacula-restores select all done 
 yes
 wait
+status storage=tape
 messages
-@$out
 quit
 END_OF_DATA