From 05df3709810890f21721cdce476c16992a4d16e5 Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Wed, 15 Jan 2020 13:38:01 +0100
Subject: [PATCH] systemtests: reload tests: use $BAREOS_DIRECTOR_BINARY
 instead of bareos-dir

---
 .../tests/reload-works-on-adding-client-resource/testrunner     | 2 +-
 .../reload-works-on-adding-duplicate-job-resource/testrunner    | 2 +-
 .../tests/reload-works-on-adding-empty-job-resource/testrunner  | 2 +-
 .../reload-works-on-adding-second-director-resource/testrunner  | 2 +-
 .../tests/reload-works-on-adding-uncommented-string/testrunner  | 2 +-
 systemtests/tests/reload-works-on-unchanged-config/testrunner   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/systemtests/tests/reload-works-on-adding-client-resource/testrunner b/systemtests/tests/reload-works-on-adding-client-resource/testrunner
index 4ada9d3b43f..5c4df32d383 100755
--- a/systemtests/tests/reload-works-on-adding-client-resource/testrunner
+++ b/systemtests/tests/reload-works-on-adding-client-resource/testrunner
@@ -33,7 +33,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"
diff --git a/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner b/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner
index 4a62992044d..7740d7b6a2e 100755
--- a/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner
+++ b/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"
diff --git a/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner b/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner
index 538dbf57899..d328c5c84a6 100755
--- a/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner
+++ b/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"
diff --git a/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner b/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner
index 796dc834eda..6a6c5f20b87 100755
--- a/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner
+++ b/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"
diff --git a/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner b/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner
index c77492c163f..0f23ce3776f 100755
--- a/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner
+++ b/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"
diff --git a/systemtests/tests/reload-works-on-unchanged-config/testrunner b/systemtests/tests/reload-works-on-unchanged-config/testrunner
index c0aedad18d2..cfea078357f 100755
--- a/systemtests/tests/reload-works-on-unchanged-config/testrunner
+++ b/systemtests/tests/reload-works-on-unchanged-config/testrunner
@@ -31,7 +31,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"