[Git][ghc/ghc][master] 3 commits: testsuite: Fix T17786 on Windows

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
03060b2f by Ben Gamari at 2020-03-29T17:30:05-04:00
testsuite: Fix T17786 on Windows

Fixes line ending normalization issue.

- - - - -
1f7995ba by Ben Gamari at 2020-03-29T17:30:05-04:00
testsuite: Fix T17786

Fix missing quoting and expected exit code.

- - - - -
ef9c608e by Ben Gamari at 2020-03-29T17:30:05-04:00
testsuite: Mark T12971 as broken on Windows

Due to #17945.

- - - - -


3 changed files:

- testsuite/tests/codeGen/should_compile/Makefile
- testsuite/tests/driver/Makefile
- testsuite/tests/driver/all.T


Changes:

=====================================
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


=====================================
testsuite/tests/driver/Makefile
=====================================
@@ -678,4 +678,4 @@ T14452:
 .PHONY: T17786
 T17786:
 	# N.B. Check for the presence of caret diagnostics.
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v $(shell cygpath -w -a T17786.hs) 2>&1 | grep --quiet '3 |'
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v "$(shell cygpath -w -a T17786.hs)" 2>&1 | grep --quiet '3 |'


=====================================
testsuite/tests/driver/all.T
=====================================
@@ -258,7 +258,7 @@ test('T12752pass', normal, compile, ['-DSHOULD_PASS=1 -Wcpp-undef'])
 
 test('T12955', normal, makefile_test, [])
 
-test('T12971', ignore_stdout, makefile_test, [])
+test('T12971', [when(opsys('mingw32'), expect_broken(17945)), ignore_stdout], makefile_test, [])
 test('json', normal, compile_fail, ['-ddump-json'])
 test('json2', normalise_version('base','ghc-prim'), compile, ['-ddump-types -ddump-json'])
 test('T13604', [], makefile_test, [])
@@ -278,4 +278,4 @@ test('T16737',
      compile_and_run, ['-optP=-isystem -optP=T16737include'])
 
 test('T17143', exit_code(1), run_command, ['{compiler} T17143.hs -S -fno-code'])
-test('T17786', [unless(opsys('mingw32'), skip), exit_code(1)], makefile_test, [])
+test('T17786', unless(opsys('mingw32'), skip), makefile_test, [])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54250f2d8de910b094070c1b48f086030df634b1...ef9c608eba417c59fe45c9edd6a946c59f50b5d2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54250f2d8de910b094070c1b48f086030df634b1...ef9c608eba417c59fe45c9edd6a946c59f50b5d2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200329/6eb8b438/attachment-0001.html>