Big backport from Enterprise

[bacula/bacula] / regress / tests / multi-storage-test

diff --git a/regress/tests/multi-storage-test b/regress/tests/multi-storage-test
index 5c13487ce4928357b8ef09203b51b9c767c4570a..5c915ca21bd042ff8cf4c97a7ff1a7140995f44a 100755 (executable)
--- a/regress/tests/multi-storage-test
+++ b/regress/tests/multi-storage-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # This script uses the virtual disk autochanger
 #
@@ -18,10 +23,10 @@ if (/WorkingDirectory/) { $_ =~ s/"$/2"/; }
 print;
 ' $conf/bacula-sd.conf > $conf/bacula-sd2.conf
 
-mkdir ${working}2
+mkdir -p ${working}2
 
 perl -ne '
-if (/^Storage {/) { $in=1; $nb++; }
+if (/^Storage \{/) { $in=1; $nb++; }
 if (/^}/) { $in=0 }
 if (/SDPort = (\d+)/ && $in) {if ($nb == 2) { $_ = "  SDPort = 1$1\n"; }}
 print;
@@ -33,7 +38,7 @@ sed 's/bacula-sd.conf/bacula-sd2.conf/' $scripts/bacula-ctl-sd \
     > $tmp/bacula-ctl-sd
 chmod +x $tmp/bacula-ctl-sd
 
-disable_pluguins
+disable_plugins
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
@@ -42,7 +47,7 @@ start_test
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 label storage=tape volume=TestVolume001 Pool=Default slot=1 drive=0
@@ -61,7 +66,7 @@ echo "ficheriro2.txt" >${cwd}/build/po/ficheriro2.txt
 
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 @# Force Incremental on the second Volume