diff options
| -rw-r--r-- | testsuite/mk/ghc-config.hs | 6 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index 84f1523fd5..cf550082db 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -42,6 +42,12 @@ main = do _ -> "NO" putStrLn $ "MinGhcVersion711" ++ '=':minGhcVersion711 + let minGhcVersion801 = case lookup "Project version" fields of + Just v + | parseVersion v >= [8,1] -> "YES" + _ -> "NO" + putStrLn $ "MinGhcVersion801" ++ '=':minGhcVersion801 + getGhcFieldOrFail :: [(String,String)] -> String -> String -> IO () getGhcFieldOrFail fields mkvar key diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index d4bd5feb66..16be955992 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -43,6 +43,12 @@ TEST_HC_OPTS += -fno-warn-missed-specialisations TEST_HC_OPTS += -fshow-warning-groups endif +ifeq "$(MinGhcVersion801)" "YES" +# Turn off any VT800 codes in the output or they wreak havoc on the +# testsuite output. +TEST_HC_OPTS += -fdiagnostics-color=never +endif + # Add the no-debug-output last as it is often convenient to copy the test invocation # removing this line. TEST_HC_OPTS += -dno-debug-output |