diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-04-20 18:51:48 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-04-20 18:51:48 +0200 |
| commit | 17970797ba2c8ea455043fd6b6e108b7540b544a (patch) | |
| tree | e25a474fa942a4732d6bd3db694995f93c39f8f4 | |
| parent | 9cc5e656ca36614ebb8703b8298f31ee02deab43 (diff) | |
| download | gnulib-17970797ba2c8ea455043fd6b6e108b7540b544a.tar.gz | |
parse-duration tests: Fix test failure on mingw.
* tests/test-parse-duration.sh: Transform CRLF to LF in the output,
before analyzing the output.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tests/test-parse-duration.sh | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,9 @@ 2023-04-20 Bruno Haible <bruno@clisp.org> + 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>&- |