[PATCH ndctl] test: monitor: Use in-tree configuration file

From: Michal Suchanek <msuchanek@suse.de>
To: nvdimm@lists.linux.dev
Cc: Michal Suchanek <msuchanek@suse.de>
Subject: [PATCH ndctl] test: monitor: Use in-tree configuration file
Date: Thu, 28 Apr 2022 21:08:31 +0200	[thread overview]
Message-ID: <20220428190831.15251-1-msuchanek@suse.de> (raw)

When ndctl is not installed /etc/ndctl.conf.d does not exist and the
monitor fails to start. Use in-tree configuration for testing.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 test/monitor.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/monitor.sh b/test/monitor.sh
index e58c908..c5beb2c 100755
--- a/test/monitor.sh
+++ b/test/monitor.sh
@@ -13,6 +13,8 @@ smart_supported_bus=""
 
 . $(dirname $0)/common
 
+monitor_conf="$TEST_PATH/../ndctl"
+
 check_prereq "jq"
 
 trap 'err $LINENO' ERR
@@ -22,7 +24,7 @@ check_min_kver "4.15" || do_skip "kernel $KVER may not support monitor service"
 start_monitor()
 {
 	logfile=$(mktemp)
-	$NDCTL monitor -l $logfile $1 &
+	$NDCTL monitor -c "$monitor_conf" -l $logfile $1 &
 	monitor_pid=$!
 	sync; sleep 3
 	truncate --size 0 $logfile #remove startup log
-- 
2.36.0

