backup-bareos-encrypt-signature-tests: apply shellcheck cleanups

bareos · Feb 3, 2020 · 5e227f7 · 5e227f7
1 parent 44d0c51
commit 5e227f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/systemtests/tests/backup-bareos-encrypt-signature-test-with-tls-cert/testrunner b/systemtests/tests/backup-bareos-encrypt-signature-test-with-tls-cert/testrunner
@@ -7,20 +7,23 @@ TestName="$(basename "$(pwd)")"
 export TestName
 
 JobName=backup-bareos-fd
+
+#shellcheck source=../environment.in
 . ./environment
-. ${scripts}/functions
 
-${scripts}/cleanup
-${scripts}/setup
+#shellcheck source=../scripts/functions
+. "${rscripts}"/functions
+"${rscripts}"/cleanup
+"${rscripts}"/setup
 
 
 # Directory to backup.
-# This directory will be created by setup_data().
+# This directory will be created by setup_data "$@"().
 BackupDirectory="${tmp}/data"
 
 # Use a tgz to setup data to be backed up.
 # Data will be placed at "${tmp}/data/".
-setup_data
+setup_data "$@"
 
 start_test
 
@@ -48,7 +51,7 @@ messages
 quit
 END_OF_DATA
 
-run_bareos
+run_bareos "$@"
 check_for_zombie_jobs storage=File
 stop_bareos
 

diff --git a/systemtests/tests/backup-bareos-encrypt-signature-test/testrunner b/systemtests/tests/backup-bareos-encrypt-signature-test/testrunner
@@ -7,20 +7,23 @@ TestName="$(basename "$(pwd)")"
 export TestName
 
 JobName=backup-bareos-fd
+
+#shellcheck source=../environment.in
 . ./environment
-. ${scripts}/functions
 
-${scripts}/cleanup
-${scripts}/setup
+#shellcheck source=../scripts/functions
+. "${rscripts}"/functions
+"${rscripts}"/cleanup
+"${rscripts}"/setup
 
 
 # Directory to backup.
-# This directory will be created by setup_data().
+# This directory will be created by setup_data "$@"().
 BackupDirectory="${tmp}/data"
 
 # Use a tgz to setup data to be backed up.
 # Data will be placed at "${tmp}/data/".
-setup_data
+setup_data "$@"
 
 start_test
 
@@ -48,7 +51,7 @@ messages
 quit
 END_OF_DATA
 
-run_bareos
+run_bareos "$@"
 check_for_zombie_jobs storage=File
 stop_bareos