| From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Tue, 8 Nov 2022 13:31:34 -0800 |
| Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU |
| specific version mark it so |
| |
| Upstream-Status: Inappropriate [Upstream systemd only supports glibc] |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| src/libsystemd/sd-bus/test-bus-error.c | 2 ++ |
| src/test/test-errno-util.c | 3 ++- |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c |
| index a55f3f9856..4123bf3da0 100644 |
| --- a/src/libsystemd/sd-bus/test-bus-error.c |
| +++ b/src/libsystemd/sd-bus/test-bus-error.c |
| @@ -99,7 +99,9 @@ TEST(error) { |
| assert_se(!sd_bus_error_is_set(&error)); |
| assert_se(sd_bus_error_set_errno(&error, EBUSY) == -EBUSY); |
| assert_se(streq(error.name, "System.Error.EBUSY")); |
| +#ifdef __GLIBC__ |
| assert_se(streq(error.message, STRERROR(EBUSY))); |
| +#endif |
| assert_se(sd_bus_error_has_name(&error, "System.Error.EBUSY")); |
| assert_se(sd_bus_error_get_errno(&error) == EBUSY); |
| assert_se(sd_bus_error_is_set(&error)); |
| diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c |
| index 376d532281..967cfd4d67 100644 |
| --- a/src/test/test-errno-util.c |
| +++ b/src/test/test-errno-util.c |
| @@ -4,7 +4,7 @@ |
| #include "stdio-util.h" |
| #include "string-util.h" |
| #include "tests.h" |
| - |
| +#ifdef __GLIBC__ |
| TEST(strerror_not_threadsafe) { |
| /* Just check that strerror really is not thread-safe. */ |
| log_info("strerror(%d) → %s", 200, strerror(200)); |
| @@ -46,6 +46,7 @@ TEST(STRERROR_OR_ELSE) { |
| log_info("STRERROR_OR_ELSE(EPERM, \"EOF\") → %s", STRERROR_OR_EOF(EPERM)); |
| log_info("STRERROR_OR_ELSE(-EPERM, \"EOF\") → %s", STRERROR_OR_EOF(-EPERM)); |
| } |
| +#endif /* __GLIBC__ */ |
| |
| TEST(PROTECT_ERRNO) { |
| errno = 12; |
| -- |
| 2.34.1 |
| |