diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2017-08-27 01:48:23 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2017-08-30 16:00:07 +0900 |
commit | 5ed0dcf4d552271115d96d8d22b1a25494b85277 (patch) | |
tree | 38874c671865a4271c283c9960d275cbf265f52a /test | |
parent | 53d133ea1bb4c4ed44c4b6aae42f1feb33d9cb78 (diff) | |
download | systemd-5ed0dcf4d552271115d96d8d22b1a25494b85277.tar.gz |
test: drop Exec* prefixes to obtain paths of executables
Diffstat (limited to 'test')
-rwxr-xr-x | test/networkd-test.py | 2 | ||||
-rw-r--r-- | test/test-functions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/networkd-test.py b/test/networkd-test.py index 9bf7ee0019..5760ca5137 100755 --- a/test/networkd-test.py +++ b/test/networkd-test.py @@ -752,7 +752,7 @@ DNS=192.168.5.1 EOF # run networkd as in systemd-networkd.service -exec $(systemctl cat systemd-networkd.service | sed -n '/^ExecStart=/ { s/^.*=//; p}') +exec $(systemctl cat systemd-networkd.service | sed -n '/^ExecStart=/ { s/^.*=//; s/^[@+-]//; s/^!*//; p}') ''' % {'ifr': self.if_router, 'ifc': self.iface, 'addr6': ipv6 and 'Address=2600::1/64' or '', 'dhopts': dhcpserver_opts or ''}) diff --git a/test/test-functions b/test/test-functions index 67fe5e19b8..745c0a9abe 100644 --- a/test/test-functions +++ b/test/test-functions @@ -426,7 +426,7 @@ install_execs() { systemduserunitdir=$(pkg-config --variable=systemduserunitdir systemd) egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/{$systemdsystemunitdir,$systemduserunitdir}/*.service \ | while read i; do - i=${i##Exec*=}; i=${i##-} + i=${i##Exec*=}; i=${i##[@+\!-]}; i=${i##\!} # some {rc,halt}.local scripts and programs are okay to not exist, the rest should inst $i || [ "${i%.local}" != "$i" ] || [ "${i%systemd-update-done}" != "$i" ] done |