summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-03-22 15:21:36 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-03-29 17:30:05 -0400
commit03060b2f963436dd22582f3a1c218b7a74d302ec (patch)
treeae5b25f78f715d2de746920e1a2fd1a33a956a83
parent54250f2d8de910b094070c1b48f086030df634b1 (diff)
downloadhaskell-03060b2f963436dd22582f3a1c218b7a74d302ec.tar.gz
testsuite: Fix T17786 on Windows
Fixes line ending normalization issue.
-rw-r--r--testsuite/tests/codeGen/should_compile/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/codeGen/should_compile/Makefile b/testsuite/tests/codeGen/should_compile/Makefile
index 45d1b605a0..ead93e20cb 100644
--- a/testsuite/tests/codeGen/should_compile/Makefile
+++ b/testsuite/tests/codeGen/should_compile/Makefile
@@ -63,11 +63,11 @@ T17648:
# -O is necessary as otherwise we don't write interface pragmas (e.g.
# NoCafRefs) to the interface files.
'$(TEST_HC)' $(TEST_HC_OPTS) -dno-typeable-binds -O T17648.hs -v0
- '$(TEST_HC)' --show-iface T17648.hi | tr -d '\n' | \
+ '$(TEST_HC)' --show-iface T17648.hi | tr -d '\n\r' | \
grep -F 'f :: T GHC.Types.Int -> () [HasNoCafRefs, Arity' >/dev/null
# Second compilation with -fcatch-bottoms, f should be CAFFY
'$(TEST_HC)' $(TEST_HC_OPTS) -dno-typeable-binds -O \
-fcatch-bottoms T17648.hs -v0 -fforce-recomp
- '$(TEST_HC)' --show-iface T17648.hi | tr -d '\n' | \
+ '$(TEST_HC)' --show-iface T17648.hi | tr -d '\n\r' | \
grep -F 'f :: T GHC.Types.Int -> () [Arity: 1, Strictness' >/dev/null