From 0feccc0b27e5531f7aae4484b0c18a252a6ecfd0 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> Date: Sat, 9 Jun 2018 12:28:22 +0200 Subject: [PATCH] GHC 8.4.3 is a bit chattier than previous ones. --- cabal-testsuite/Test/Cabal/Monad.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cabal-testsuite/Test/Cabal/Monad.hs b/cabal-testsuite/Test/Cabal/Monad.hs index 3ff11d2694..963604b380 100644 --- a/cabal-testsuite/Test/Cabal/Monad.hs +++ b/cabal-testsuite/Test/Cabal/Monad.hs @@ -423,8 +423,10 @@ normalizeOutput nenv = -- Apply this before packageIdRegex, otherwise this regex doesn't match. . resub "([a-zA-Z]+(-[a-zA-Z])*)-[0-9]+(\\.[0-9]+)*/installed-[A-Za-z0-9.]+" "\\1-<VERSION>/installed-<HASH>..." - . -- Normalize architecture - resub (posixRegexEscape (display (normalizerPlatform nenv))) "<ARCH>" + -- Normalize architecture + . resub (posixRegexEscape (display (normalizerPlatform nenv))) "<ARCH>" + -- Some GHC versions are chattier than others + . resub "^ignoring \\(possibly broken\\) abi-depends field for packages" "" -- Normalize the current GHC version. Apply this BEFORE packageIdRegex, -- which will pick up the install ghc library (which doesn't have the -- date glob). -- GitLab