From 2b812101be6e01d63edf89e9e8359103f0bdc75a Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 29 Aug 2026 13:54:06 +0200 Subject: [PATCH] test: run keventd from the configured libexec path make distcheck fails in dbus-device: sh: /libexec/finit/keventd: not found distcheck configures with --prefix=$(distdir)/_inst, so the bundled helpers install below that prefix, not in /libexec/finit, which the test had hard coded. Export the configured pkglibexecdir as FINIT_EXECPATH in test.env and run keventd from there, the same path finit itself is built with. Signed-off-by: Joachim Wiberg --- test/dbus-device.sh | 2 +- test/test.env.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/dbus-device.sh b/test/dbus-device.sh index 9c042b93..c2dafc5a 100755 --- a/test/dbus-device.sh +++ b/test/dbus-device.sh @@ -81,7 +81,7 @@ info=$(texec "$CLIENT" call-s "$DEVBUS" /org/finit/device \ assert "Info answered for dummy0" 0 -eq 0 say "keventd -S settles via the bus" -run "/libexec/finit/keventd -S -t 15" || fail "keventd -S failed" +run "$FINIT_EXECPATH/keventd -S -t 15" || fail "keventd -S failed" assert "bus-first settle ok" 0 -eq 0 say "Trigger(add, net) re-emits events, DeviceProcessed observed" diff --git a/test/test.env.in b/test/test.env.in index 5cef2489..3dac88b8 100644 --- a/test/test.env.in +++ b/test/test.env.in @@ -4,3 +4,4 @@ exec_prefix=@exec_prefix@ export TESTENV_PATH=/bin:/sbin:/usr/bin:/usr/sbin:"@bindir@":"@sbindir@" export FINIT_CONF="@FINIT_CONF@" export FINIT_RCSD="@FINIT_RCSD@" +export FINIT_EXECPATH="@pkglibexecdir@"