[Git][ghc/ghc][master] 2 commits: testsuite: Mark T12971 as broken on Windows

[Marge Bot]

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


Commits:
f8f60efc by Ben Gamari at 2020-09-30T02:49:03-04:00
testsuite: Mark T12971 as broken on Windows

Due to #17945.

- - - - -
6527fc57 by Ben Gamari at 2020-09-30T02:49:03-04:00
Bump Cabal, hsc2hs, directory, process submodules

Necessary for recent Win32 bump.

- - - - -


8 changed files:

- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/src/Rules/Generate.hs
- libraries/Cabal
- libraries/directory
- libraries/process
- testsuite/tests/driver/all.T
- utils/hsc2hs


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -76,7 +76,7 @@ Library
                    ghci == @ProjectVersionMunged@
 
     if os(windows)
-        Build-Depends: Win32  >= 2.3 && < 2.10
+        Build-Depends: Win32  >= 2.3 && < 2.11
     else
         if flag(terminfo)
             Build-Depends: terminfo == 0.4.*


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -45,7 +45,7 @@ Executable ghc
                    ghc        == @ProjectVersionMunged@
 
     if os(windows)
-        Build-Depends: Win32  >= 2.3 && < 2.10
+        Build-Depends: Win32  >= 2.3 && < 2.11
     else
         Build-Depends: unix   >= 2.7 && < 2.9
 


=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -166,7 +166,7 @@ copyRules = do
         prefix -/- "ghci-usage.txt"    <~ return "driver"
         prefix -/- "llvm-targets"      <~ return "."
         prefix -/- "llvm-passes"       <~ return "."
-        prefix -/- "template-hsc.h"    <~ return (pkgPath hsc2hs)
+        prefix -/- "template-hsc.h" <~ return (pkgPath hsc2hs -/- "data")
 
         prefix -/- "html/**"           <~ return "utils/haddock/haddock-api/resources"
         prefix -/- "latex/**"          <~ return "utils/haddock/haddock-api/resources"


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 5139d6e72d391bffa3cf06f08884277799eb0b45
+Subproject commit 5aea8a4b8463e1ae95272e190a1022764164294f


=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit c16afcda5708ee9944afa7ea6858e5be894fe67e
+Subproject commit b697b3ea77dd4803f2f8f676dd64c8ea5277fcf0


=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 11afa0bb827d05ed535463235c5f1805e8992273
+Subproject commit 72c6be917064c923e365622032d1f2fa07acb5eb


=====================================
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('T16167', exit_code(1), run_command, 


=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit 7accbea001bcac638c4320d3755af29478114901
+Subproject commit 9cacd5d465d5797e4935d1aa6ae6a71488a03938



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3ab0d8f77ec67676de40ebe6ff7e86756e5c761e...6527fc57b8e099703f5bdb5ec7f1dfd421651972

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3ab0d8f77ec67676de40ebe6ff7e86756e5c761e...6527fc57b8e099703f5bdb5ec7f1dfd421651972
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/20200930/800bb3b9/attachment-0001.html>