summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-04-20 18:39:33 +0200
committerBruno Haible <bruno@clisp.org>2023-04-20 18:39:33 +0200
commit9cc5e656ca36614ebb8703b8298f31ee02deab43 (patch)
treee091ca70b75d0f3893d06bd71d94bcfcd8eb9fde
parentebb4fc023d744ea059d1bc5c820213ceb8a370bf (diff)
downloadgnulib-9cc5e656ca36614ebb8703b8298f31ee02deab43.tar.gz
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.
-rw-r--r--ChangeLog6
-rwxr-xr-xtests/test-dfa-invalid-char-class.sh3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 485ed10025..8222100dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2023-04-20 Bruno Haible <bruno@clisp.org>
+ 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.
+
+2023-04-20 Bruno Haible <bruno@clisp.org>
+
Fix uses of libwinpthread on mingw 10.
* m4/threadlib.m4 (gl_WEAK_SYMBOLS): On mingw, set the result to
"guessing no".
diff --git a/tests/test-dfa-invalid-char-class.sh b/tests/test-dfa-invalid-char-class.sh
index 1428d7966a..b9b18980b6 100755
--- a/tests/test-dfa-invalid-char-class.sh
+++ b/tests/test-dfa-invalid-char-class.sh
@@ -24,7 +24,8 @@ path_prepend_ .
fail=0
echo 'dfaerror: invalid character class' > exp
-LC_ALL=C ${CHECKER} test-dfa-match-aux '[[:foo:]]' a > out 2>&1
+LC_ALL=C ${CHECKER} test-dfa-match-aux '[[:foo:]]' a > tmp 2>&1
+LC_ALL=C tr -d '\r' < tmp > out
compare exp out || fail=1
Exit $fail