From b5db9cb252e3a13c61b5211020d55c6f28da12d5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 20 Apr 2023 18:51:48 +0200 Subject: [PATCH] parse-duration tests: Fix test failure on mingw. * tests/test-parse-duration.sh: Transform CRLF to LF in the output, before analyzing the output. --- ChangeLog | 6 ++++++ tests/test-parse-duration.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dd6a5b4ebe..abf545d4c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-04-20 Bruno Haible + + parse-duration tests: Fix test failure on mingw. + * tests/test-parse-duration.sh: Transform CRLF to LF in the output, + before analyzing the output. + 2023-04-20 Bruno Haible Fix uses of libwinpthread on mingw 10. diff --git a/tests/test-parse-duration.sh b/tests/test-parse-duration.sh index 7f27f72a60..9aabc24ec7 100755 --- a/tests/test-parse-duration.sh +++ b/tests/test-parse-duration.sh @@ -62,7 +62,8 @@ cat > "${tmpf}" <<- _EOF_ exec 3< "${tmpf}" while read line <&3 do - v=`${CHECKER} ${exe} "${line}"` || { ls -l "${tmpf}"; die "Failed: ${exe} '${line}'"; } + v=`${CHECKER} ${exe} "${line}" | LC_ALL=C tr -d '\r'` \ + || { ls -l "${tmpf}"; die "Failed: ${exe} '${line}'"; } test $v -eq 38898367 || die $v is not 38898367 done exec 3>&- -- 2.39.5