shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 18:55:40 +03:00
Code

Merge pull request #27958 from mrc0mmand/test-functions-tweaks

Browse Source 
test: a couple of assorted test-functions tweaks
This commit is contained in:
Luca Boccassi 2023-06-07 21:54:01 +01:00 committed by GitHub
commit bd65ee34ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/TEST-16-EXTEND-TIMEOUT/test.sh
View File

@ -3,7 +3,6 @@
set -e
TEST_DESCRIPTION="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
SKIP_INITRD=yes
TEST_NO_QEMU=1
# shellcheck source=test/test-functions

6
test/test-functions
View File

@ -295,7 +295,6 @@ IS_BUILT_WITH_COVERAGE=$(is_built_with_coverage && echo yes || echo no)
if get_bool "$IS_BUILT_WITH_ASAN"; then
PATH_TO_INIT="$ROOTLIBDIR/systemd-under-asan"
SKIP_INITRD="${SKIP_INITRD:-yes}"
QEMU_MEM="${QEMU_MEM:-2G}"
QEMU_SMP="${QEMU_SMP:-4}"
@ -577,7 +576,7 @@ run_qemu() {
kernel_params+=("${user_kernel_append[@]}")
fi
if [[ "$INITRD" ]] && ! get_bool "$SKIP_INITRD"; then
if [[ -n "$INITRD" ]]; then
qemu_options+=(-initrd "$INITRD")
fi
@ -931,6 +930,7 @@ create_asan_wrapper() {
# runtime ASan DSO is in a non-standard (library) path.
mkdir -p "${initdir:?}/etc/ld.so.conf.d/"
echo "${ASAN_RT_PATH%/*}" >"${initdir:?}/etc/ld.so.conf.d/asan-path-override.conf"
ldconfig -r "$initdir"
fi
# Create a simple environment file which can be included by systemd services
@ -2733,7 +2733,7 @@ inst_binary() {
# nsswitch.conf uses [SUCCESS=merge] (like on Arch Linux)
# delv, dig - pull in nss_resolve if `resolve` is in nsswitch.conf
# tar - called by machinectl in TEST-25
bin_rx='/(chown|delv|dig|getent|id|login|ls|mkfs\.[a-z0-9]+|mksquashfs|mkswap|setfacl|setpriv|stat|su|tar|useradd|userdel)$'
bin_rx='/(agetty|chown|delv|dig|getfacl|getent|id|login|ls|mkfs\.[a-z0-9]+|mksquashfs|mkswap|setfacl|setpriv|stat|su|tar|useradd|userdel)$'
if get_bool "$IS_BUILT_WITH_ASAN" && [[ "$bin" =~ $bin_rx ]]; then
wrap_binary=1
fi