From 1b0cc135d0b1df4b8cddedbb72acde25b20adfd0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 7 Apr 2024 16:24:38 +0100 Subject: [PATCH] test-execute: check for s390x first and duplicate test s390x will define both s390x and s390, so exec-personality-s390.service is ran in both cases but fails on s390x, as the personality returned is s390x. Split the test and check specifically for s390x. --- src/test/test-execute.c | 3 +++ test/test-execute/exec-personality-s390x.service | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 test/test-execute/exec-personality-s390x.service diff --git a/src/test/test-execute.c b/src/test/test-execute.c index e154901f13..e9b922b42e 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -456,6 +456,9 @@ static void test_exec_personality(Manager *m) { #if defined(__x86_64__) test(m, "exec-personality-x86-64.service", 0, CLD_EXITED); +#elif defined(__s390x__) + test(m, "exec-personality-s390x.service", 0, CLD_EXITED); + #elif defined(__s390__) test(m, "exec-personality-s390.service", 0, CLD_EXITED); diff --git a/test/test-execute/exec-personality-s390x.service b/test/test-execute/exec-personality-s390x.service new file mode 100644 index 0000000000..4545dee4c3 --- /dev/null +++ b/test/test-execute/exec-personality-s390x.service @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Test for Personality=s390x + +[Service] +ExecStart=sh -x -c 'c=$$(uname -m); test "$$c" = "s390x"' +Type=oneshot +Personality=s390x