From 17970797ba2c8ea455043fd6b6e108b7540b544a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 20 Apr 2023 18:51:48 +0200 Subject: 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 | 4 ++++ tests/test-parse-duration.sh | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8222100dfd..42b727f88c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +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. + dfa tests: Fix test failure on mingw. * tests/test-dfa-invalid-char-class.sh: Transform CRLF to LF in the output, before comparing with the expected output. diff --git a/tests/test-parse-duration.sh b/tests/test-parse-duration.sh index e8be5ecb7e..cf45913261 100755 --- a/tests/test-parse-duration.sh +++ b/tests/test-parse-duration.sh @@ -60,7 +60,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>&- -- cgit v1.2.1