diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-02-16 15:02:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 15:02:21 +0100 |
| commit | e43a418f8669884883763b90d072c6ba304df741 (patch) | |
| tree | a352bf4f9e12ae68dadbb91273199853720350e7 /test/units | |
| parent | TODO (diff) | |
| parent | manager: add {} around cpu sets, use range formatting (diff) | |
| download | systemd-e43a418f8669884883763b90d072c6ba304df741.tar.xz systemd-e43a418f8669884883763b90d072c6ba304df741.zip | |
Merge pull request #22271 from keszybz/manager-reexec-freeze
Freeze manager if reexec fails
Diffstat (limited to 'test/units')
| -rwxr-xr-x | test/units/testsuite-36.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/units/testsuite-36.sh b/test/units/testsuite-36.sh index b6c00c4845..f9dfd0810c 100755 --- a/test/units/testsuite-36.sh +++ b/test/units/testsuite-36.sh @@ -181,7 +181,7 @@ else echo "PID1 NUMAPolicy support - Bind policy w/o mask" writePID1NUMAPolicy "bind" pid1ReloadWithJournal - grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog" + grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog" echo "PID1 NUMAPolicy support - Bind policy w/ mask" writePID1NUMAPolicy "bind" "0" @@ -191,7 +191,7 @@ else echo "PID1 NUMAPolicy support - Interleave policy w/o mask" writePID1NUMAPolicy "interleave" pid1ReloadWithJournal - grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog" + grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog" echo "PID1 NUMAPolicy support - Interleave policy w/ mask" writePID1NUMAPolicy "interleave" "0" @@ -202,7 +202,7 @@ else writePID1NUMAPolicy "preferred" pid1ReloadWithJournal # Preferred policy with empty node mask is actually allowed and should reset allocation policy to default - grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; } + grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; } echo "PID1 NUMAPolicy support - Preferred policy w/ mask" writePID1NUMAPolicy "preferred" "0" |