shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

test-systemctl-enable: also use freshly-built systemd-id128

Browse Source 
Tests were failing on centos7 because systemd-id128 is not in path.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-28 20:03:37 +02:00
parent d6c51c485a
commit 2a2d002fb0
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meson.build
View File

@ -2446,7 +2446,7 @@ public_programs += executable(
install_rpath : rootlibexecdir,
install : true)
exe = executable(
systemctl = executable(
'systemctl',
systemctl_sources,
include_directories : includes,
@ -2460,13 +2460,7 @@ exe = executable(
install_rpath : rootlibexecdir,
install : true,
install_dir : rootbindir)
public_programs += exe
if want_tests != 'false'
test('test-systemctl-enable',
test_systemctl_enable_sh,
# https://github.com/mesonbuild/meson/issues/2681
args : exe.full_path())
endif
public_programs += systemctl
if conf.get('ENABLE_PORTABLED') == 1
dbus_programs += executable(
@ -3285,13 +3279,22 @@ executable(
install : true,
install_dir : rootlibexecdir)
public_programs += executable(
systemd_id128 = executable(
'systemd-id128',
'src/id128/id128.c',
include_directories : includes,
link_with : [libshared],
install_rpath : rootlibexecdir,
install : true)
public_programs += systemd_id128
if want_tests != 'false'
test('test-systemctl-enable',
test_systemctl_enable_sh,
# https://github.com/mesonbuild/meson/issues/2681
args : [systemctl.full_path(),
systemd_id128.full_path()])
endif
public_programs += executable(
'systemd-path',

5
test/test-systemctl-enable.sh
View File

@ -6,6 +6,7 @@ set -ex
export SYSTEMD_IGNORE_CHROOT=1
systemctl=${1:-systemctl}
systemd_id128=${2:-systemd-id128}
unset root
cleanup() {
@ -606,7 +607,7 @@ check_alias o 'the-id'
check_alias w '39a'
check_alias W 'right'
check_alias b "$(systemd-id128 boot-id)"
check_alias b "$("$systemd_id128" boot-id)"
# Specifiers not available for [Install]
( ! check_alias C '' )
@ -637,7 +638,7 @@ check_alias l "$(uname -n | sed 's/\..*//')"
test ! -e "$root/etc/machine-id"
( ! check_alias m '' )
systemd-id128 new >"$root/etc/machine-id"
"$systemd_id128" new >"$root/etc/machine-id"
check_alias m "$(cat "$root/etc/machine-id")"
check_alias n 'some-some-link6@.socket'