1
0
mirror of https://github.com/systemd/systemd synced 2026-03-25 16:25:04 +01:00

Compare commits

..

No commits in common. "9848f56cc68a5f193d515f080b7b01e6a689ae22" and "7c0afcdde22d3d94fd23bfd0e473c263aaf54e8a" have entirely different histories.

9 changed files with 8 additions and 17 deletions

View File

@ -124,8 +124,7 @@ jobs:
--no-stdsplit \
--num-processes "$(($(nproc) - 1))" \
--timeout-multiplier 2 \
--max-lines 300 \
--quiet
--max-lines 300
- name: Archive failed test journals
uses: actions/upload-artifact@v4

View File

@ -80,7 +80,7 @@ jobs:
run: mkosi box -- env CC=clang CXX=clang++ meson setup -Dlocalegen-path=/usr/bin/locale-gen -Dcompat-mutable-uid-boundaries=true build
- name: Run clang-tidy
run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit --quiet
run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit
- name: Build with musl
run: mkosi box -- .github/workflows/build-test-musl.sh

View File

@ -308,7 +308,6 @@ jobs:
--print-errorlogs \
--no-stdsplit \
--num-processes "$(($(nproc) - 1))" \
--quiet \
"${MAX_LINES[@]}"
- name: Archive failed test journals

View File

@ -47,7 +47,7 @@ for phase in "${PHASES[@]}"; do
# correctly detect the environment.
env \
SYSTEMD_IN_CHROOT=yes \
meson test -C build --print-errorlogs --no-stdsplit --quiet
meson test -C build --print-errorlogs --no-stdsplit
;;
CLEANUP)
info "Cleanup phase"

View File

@ -109,7 +109,7 @@ for phase in "${PHASES[@]}"; do
run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
ninja -C build -v
# Ensure setting a timezone (like the reproducible build tests do) does not break time/date unit tests
TZ=GMT+12 meson test "${MESON_TEST_ARGS[@]}" -C build --print-errorlogs --no-stdsplit --quiet
TZ=GMT+12 meson test "${MESON_TEST_ARGS[@]}" -C build --print-errorlogs --no-stdsplit
;;
RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
# TODO: drop after we switch to ubuntu 26.04
@ -151,7 +151,7 @@ for phase in "${PHASES[@]}"; do
# during debugging, wonderful), so let's at least keep a workaround
# here to make the builds stable for the time being.
(set +x; while :; do echo -ne "\n[WATCHDOG] $(date)\n"; sleep 30; done) &
meson test --timeout-multiplier=3 -C build --print-errorlogs --no-stdsplit --quiet
meson test --timeout-multiplier=3 -C build --print-errorlogs --no-stdsplit
;;
CLEANUP)
info "Cleanup phase"

2
README
View File

@ -290,7 +290,7 @@ REQUIREMENTS:
Useful commands:
ninja -C build -v some/target
meson test -C build/ -q
meson test -C build/
sudo meson install -C build/ --no-rebuild
DESTDIR=... meson install -C build/

View File

@ -43,7 +43,7 @@ $ mkosi -f genkey # Generate signing
$ mkosi -f box -- meson setup -Dbpf-framework=disabled build # bpftool detection inside mkosi box is broken on Ubuntu Noble and older
$ mkosi -f box -- meson compile -C build
$ mkosi -f box -- build/systemctl --version
$ mkosi -f box -- meson test -C build --print-errorlogs -q # Run the unit tests
$ mkosi -f box -- meson test -C build --print-errorlogs # Run the unit tests
```
To build and boot an OS image with the latest systemd installed:

View File

@ -1254,16 +1254,9 @@ sensor:modalias:acpi:SMO8500*:dmi:bvnAmericanMegatrendsInc.:bvr5.6.5:bd11/20/201
#########################################
# Wortmann
#########################################
# Wortmann AG TERRA PAD 1061
sensor:modalias:acpi:KIOX000A*:dmi:*:svnWortmann_AG:pnTERRA_PAD_1061:*
ACCEL_MOUNT_MATRIX=0, -1, 0; 1, 0, 0; 0, 0, -1
# Wortmann AG TERRA PAD 1061
# This is a variant with another sensor.
sensor:modalias:acpi:SMO8500*:dmi:*:svnWortmann_AG:pnTERRA_PAD_1061:*
ACCEL_MOUNT_MATRIX=0, -1, 0; 1, 0, 0; 0, 0, 1
#########################################
# Yours
#########################################

View File

@ -817,7 +817,7 @@ static int dns_server_compare_func(const DnsServer *x, const DnsServer *y) {
if (r != 0)
return r;
return strcmp_ptr(x->server_name, y->server_name);
return streq_ptr(x->server_name, y->server_name);
}
DEFINE_HASH_OPS(dns_server_hash_ops, DnsServer, dns_server_hash_func, dns_server_compare_func);