| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From bd182584a1e2f820493d9db689598a20c5700ba5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 2 Jan 2023 10:37:49 +0000 |
| 4 | Subject: [PATCH] tests: Handle musl's ERANGE mapping |
| 5 | |
| 6 | musl uses "Result not representable" for ERANGE, support this in |
| 7 | addition to glibc's "Numerical result out of range". |
| 8 | |
| 9 | Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/2d4ee168d7eae0afcce356a3f8135294e6d7fe6f] |
| 10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 11 | --- |
| 12 | tests/test-commit-timestamp.sh | 2 +- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/tests/test-commit-timestamp.sh b/tests/test-commit-timestamp.sh |
| 16 | index 0688c63a4bdb..de105b768a9c 100755 |
| 17 | --- a/tests/test-commit-timestamp.sh |
| 18 | +++ b/tests/test-commit-timestamp.sh |
| 19 | @@ -40,6 +40,6 @@ fi |
| 20 | ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt |
| 21 | rm -rf testrepo testrepo-files |
| 22 | assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH' |
| 23 | -assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range' |
| 24 | +assert_file_has_content commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: \(Numerical result out of range\|Result not representable\)' |
| 25 | assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000' |
| 26 | echo "ok commit with env timestamp" |
| 27 | -- |
| 28 | 2.39.0 |
| 29 | |