summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2015-11-15 17:26:05 +0000
committerEvgeny Vereshchagin <evvers@ya.ru>2015-11-15 18:30:37 +0000
commitc7eda0133b6bf13a182337cbe8a61bf2faf9b32e (patch)
treee0739b03a8d110f700834eee652fd9bf39e4ec2a
parentdb260eedc27814248da39ebdfc84a3f5584b0b16 (diff)
tests: install execs from user units too
Fixes: systemd[39]: systemd-exit.service: Executing: /bin/kill -s 58 29 systemd[39]: systemd-exit.service: Failed at step EXEC spawning /bin/kill: No such file or directory systemd[29]: Received SIGCHLD from PID 39 ((kill)). systemd[29]: Child 39 ((kill)) died (code=exited, status=203/EXEC)
-rw-r--r--test/test-functions17
1 files changed, 11 insertions, 6 deletions
diff --git a/test/test-functions b/test/test-functions
index 2f5ec9b93f..49f143ec1e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -179,12 +179,17 @@ EOF
}
install_execs() {
- # install any Execs from the service files
- egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \
- | while read i; do
- i=${i##Exec*=}; i=${i##-}
- inst $i
- done
+ ddebug "install any Execs from the service files"
+ (
+ export PKG_CONFIG_PATH=$TEST_BASE_DIR/../src/core/
+ systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd)
+ systemduserunitdir=$(pkg-config --variable=systemduserunitdir systemd)
+ egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/{$systemdsystemunitdir,$systemduserunitdir}/*.service \
+ | while read i; do
+ i=${i##Exec*=}; i=${i##-}
+ inst $i
+ done
+ )
}
generate_module_dependencies() {