summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-15 19:46:00 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-15 19:46:00 +0100
commit1418ee7598ce0cc65d785b0889ca972bac09f9d0 (patch)
tree583d9656eb9c88f73dad7c14eb29a90a0806a132 /test
parent7ee598b450b5b4b8748cf99838ae83f85fec2b76 (diff)
parentc7eda0133b6bf13a182337cbe8a61bf2faf9b32e (diff)
Merge pull request #1901 from evverx/various-fixes
Various fixes
Diffstat (limited to 'test')
-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() {