[Git][ghc/ghc][wip/ghc-9.6] 4 commits: testsuite: Mark T16392 as fragile on windows
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Wed Dec 21 00:04:39 UTC 2022
Ben Gamari pushed to branch wip/ghc-9.6 at Glasgow Haskell Compiler / GHC
Commits:
5e047eff by Matthew Pickering at 2022-12-20T15:12:04+00:00
testsuite: Mark T16392 as fragile on windows
See #22649
- - - - -
ccebbe67 by Ben Gamari at 2022-12-21T00:04:31+00:00
configure: Bump version to 9.6
- - - - -
3f590623 by Ben Gamari at 2022-12-21T00:04:31+00:00
base: Bump version to 4.18
Requires various submodule bumps.
- - - - -
3a136a1a by Ben Gamari at 2022-12-21T00:04:31+00:00
ghc-boot: Fix bootstrapping
- - - - -
24 changed files:
- compiler/ghc.cabal.in
- configure.ac
- libraries/array
- libraries/base/base.cabal
- libraries/deepseq
- libraries/directory
- libraries/filepath
- libraries/ghc-boot-th/ghc-boot-th.cabal.in
- libraries/ghc-boot/GHC/Utils/Encoding/UTF8.hs
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- libraries/parsec
- libraries/process
- libraries/stm
- libraries/template-haskell/template-haskell.cabal.in
- libraries/terminfo
- libraries/unix
- testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
- testsuite/tests/cabal/t18567/T18567.stderr
- testsuite/tests/ghci/T16392/all.T
- utils/haddock
- utils/hsc2hs
Changes:
=====================================
compiler/ghc.cabal.in
=====================================
@@ -76,7 +76,7 @@ Library
if flag(build-tool-depends)
build-tool-depends: alex:alex >= 3.2.6, happy:happy >= 1.20.0, genprimopcode:genprimopcode, deriveConstants:deriveConstants
- Build-Depends: base >= 4.11 && < 4.18,
+ Build-Depends: base >= 4.11 && < 4.19,
deepseq >= 1.4 && < 1.5,
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
=====================================
configure.ac
=====================================
@@ -13,7 +13,7 @@ dnl
# see what flags are available. (Better yet, read the documentation!)
#
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.5], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.6], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
# Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
# to be useful (cf #19058). However, the version must have three components
# (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are
=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit acd92ba77c205a039d9c6eaabb3e35d09e330160
+Subproject commit f7a498b880a1fff833699d8417bac155d58ed59e
=====================================
libraries/base/base.cabal
=====================================
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: base
-version: 4.17.0.0
+version: 4.18.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD-3-Clause
=====================================
libraries/deepseq
=====================================
@@ -1 +1 @@
-Subproject commit 28f4d5b00448239581ead0de9140ff4a6847c806
+Subproject commit 7e77698d6a78981bc2649df78021a6c33a5d3913
=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit 102428041a44835b5446c329f746c7503c283199
+Subproject commit 7f9066137c694ab7cef9a4ebd8c19a281fad42e4
=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit 872e19fce06ddd40bd0771dbd3cad2c3c6ed5e7d
+Subproject commit 7139cd3383a2aae440a57b5604a8182d9a983715
=====================================
libraries/ghc-boot-th/ghc-boot-th.cabal.in
=====================================
@@ -36,4 +36,4 @@ Library
GHC.ForeignSrcLang.Type
GHC.Lexeme
- build-depends: base >= 4.7 && < 4.18
+ build-depends: base >= 4.7 && < 4.19
=====================================
libraries/ghc-boot/GHC/Utils/Encoding/UTF8.hs
=====================================
@@ -44,17 +44,20 @@ module GHC.Utils.Encoding.UTF8
import Prelude
import Foreign
+import GHC.IO
+#if MIN_VERSION_base(4,18,0)
+import GHC.Encoding.UTF8
+#else
import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
import Data.Char
-import GHC.IO
+import GHC.Exts
import GHC.ST
+#endif
import Data.ByteString (ByteString)
import qualified Data.ByteString.Internal as BS
import Data.ByteString.Short.Internal (ShortByteString(..))
-import GHC.Exts
-
-- | Find the start of the codepoint preceding the codepoint at the given
-- 'Ptr'. This is undefined if there is no previous valid codepoint.
utf8PrevChar :: Ptr Word8 -> IO (Ptr Word8)
=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -70,7 +70,7 @@ Library
GHC.Version
GHC.Platform.Host
- build-depends: base >= 4.7 && < 4.18,
+ build-depends: base >= 4.7 && < 4.19,
binary == 0.8.*,
bytestring >= 0.10 && < 0.12,
containers >= 0.5 && < 0.7,
=====================================
libraries/ghc-compact/ghc-compact.cabal
=====================================
@@ -40,7 +40,7 @@ library
CPP
build-depends: ghc-prim >= 0.5.3 && < 0.11,
- base >= 4.9.0 && < 4.18,
+ base >= 4.9.0 && < 4.19,
bytestring >= 0.10.6.0 && <0.12
ghc-options: -Wall
=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -70,7 +70,7 @@ library
Build-Depends:
rts,
array == 0.5.*,
- base >= 4.8 && < 4.18,
+ base >= 4.8 && < 4.19,
ghc-prim >= 0.5.0 && < 0.11,
binary == 0.8.*,
bytestring >= 0.10 && < 0.12,
=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit d4f343509e905a717ea463ad84462c126d8990d8
+Subproject commit 3b9f9260239f88309c78096cae3018f87d68a1f1
=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit f1171a4b212070bb0299b636aeee7d0534a6c76c
+Subproject commit 0e23b3246fd7f6d125129316dcbedd609e6d2dca
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit cb89d5079d29c38683bcb6feec7dc53ad3836ed0
+Subproject commit 7c6871d89bd87875b4e402de26d7267c11e617a9
=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit f4eb5a85c2732f8f5a03ef8af88d6aff90945415
+Subproject commit 4ac6ead642829c9c983ee3c96ba13fa0308891ff
=====================================
libraries/template-haskell/template-haskell.cabal.in
=====================================
@@ -55,7 +55,7 @@ Library
Language.Haskell.TH.Lib.Map
build-depends:
- base >= 4.11 && < 4.18,
+ base >= 4.11 && < 4.19,
ghc-boot-th == @ProjectVersionMunged@,
ghc-prim,
pretty == 1.1.*
=====================================
libraries/terminfo
=====================================
@@ -1 +1 @@
-Subproject commit a21cc7e2d58f3e35a4ac3fb386738d9b448eaf13
+Subproject commit 0a05f06bc8a56c43578ce06d4ef1339ee70fb3fc
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit 3be0223cee7395410915a127eba3acae5ff0b2f2
+Subproject commit 98adc732bfbfca4fef945d546ecbaae13952a950
=====================================
testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
=====================================
@@ -4,4 +4,4 @@ for bkpcabal01-0.1.0.0..
Preprocessing library 'q' for bkpcabal01-0.1.0.0..
Building library 'q' instantiated with H = <H>
for bkpcabal01-0.1.0.0..
-[2 of 2] Instantiating bkpcabal01-0.1.0.0-4ArNecmPyDqFgQMPsq5SEg-p
+[2 of 2] Instantiating bkpcabal01-0.1.0.0-3A0ecVFOxAgF5zqWrGYPfn-p
=====================================
testsuite/tests/cabal/t18567/T18567.stderr
=====================================
@@ -2,4 +2,4 @@
<no location info>: warning: [GHC-42258] [-Wunused-packages]
The following packages were specified via -package or -package-id flags,
but were not needed for compilation:
- - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-Dq740EWYmHcKhGKUMfjfaX-sublib-unused)
+ - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-1v10MAkotpbGWvaODnEeBc-sublib-unused)
=====================================
testsuite/tests/ghci/T16392/all.T
=====================================
@@ -1,5 +1,7 @@
test('T16392',
[extra_files(['A.hs']),
when(config.have_RTS_linker,extra_ways(['ghci-ext'])),
- req_interp],
+ req_interp,
+ when(opsys('mingw32'), fragile(22649))
+ ],
ghci_script, ['T16392.script'])
=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit edc72530978d8a9ec92f51d288484986ec0051e3
+Subproject commit 37e3c3683ac70735ab211f59210c9abea8ae2c69
=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit ac11465d9aadbe24be4832a3775fbd4344484402
+Subproject commit 219bba062e804db0bea4bf3ffcaaba2df46334f8
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ac171b26f4b2c1168b3c0927f526264fd4733815...3a136a1ad8035c50c4f9ff90f2b2eb7b0db22450
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ac171b26f4b2c1168b3c0927f526264fd4733815...3a136a1ad8035c50c4f9ff90f2b2eb7b0db22450
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/20221220/15abf4c1/attachment-0001.html>
More information about the ghc-commits
mailing list