[Git][ghc/ghc][wip/andreask/hadrian_no_colour] 2 commits: Expect T4267 to pass

[Andreas Klebinger]

Andreas Klebinger pushed to branch wip/andreask/hadrian_no_colour at Glasgow Haskell Compiler / GHC


Commits:
f024b6e3 by Sylvain Henry at 2020-03-30T12:48:39+02:00
Expect T4267 to pass

Since 54250f2d8de910b094070c1b48f086030df634b1 we expected T4267 to
fail, but it passes on CI.

- - - - -
b314e5b6 by Andreas Klebinger at 2020-03-31T05:48:46-04:00
Make hadrian pass on the no-colour setting to GHC.

Fixes #17983.

- - - - -


2 changed files:

- hadrian/src/Settings/Builders/Ghc.hs
- testsuite/tests/perf/should_run/all.T


Changes:

=====================================
hadrian/src/Settings/Builders/Ghc.hs
=====================================
@@ -31,9 +31,12 @@ toolArgs = do
 compileAndLinkHs :: Args
 compileAndLinkHs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do
     ways <- getLibraryWays
+    useColor <- shakeColor <$> expr getShakeOptions
     let hasVanilla = elem vanilla ways
         hasDynamic = elem dynamic ways
     mconcat [ arg "-Wall"
+            , not useColor ? builder (Ghc CompileHs) ?
+              arg "-fdiagnostics-color=never"
             , (hasVanilla && hasDynamic) ? builder (Ghc CompileHs) ?
               platformSupportsSharedLibs ? way vanilla ?
               arg "-dynamic-too"


=====================================
testsuite/tests/perf/should_run/all.T
=====================================
@@ -233,8 +233,7 @@ test('T5949',
      ['-O'])
 
 test('T4267',
-     [expect_broken(4267),
-      collect_stats('bytes allocated',10),
+     [collect_stats('bytes allocated',10),
       only_ways(['normal'])],
       compile_and_run,
       ['-O'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/16c456862bbba59310c17574ee10cb9b5853c133...b314e5b648e48ac40f1b20b713920c7ea1c31304

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/16c456862bbba59310c17574ee10cb9b5853c133...b314e5b648e48ac40f1b20b713920c7ea1c31304
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/20200331/09a9fc5c/attachment.html>