diff options
| -rw-r--r-- | hadrian/src/Oracles/TestSettings.hs | 6 | ||||
| -rw-r--r-- | testsuite/mk/ghc-config.hs | 19 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 6 |
3 files changed, 1 insertions, 30 deletions
diff --git a/hadrian/src/Oracles/TestSettings.hs b/hadrian/src/Oracles/TestSettings.hs index 7541ab628f..42aea11a5b 100644 --- a/hadrian/src/Oracles/TestSettings.hs +++ b/hadrian/src/Oracles/TestSettings.hs @@ -39,9 +39,6 @@ data TestSetting = TestHostOS | TestLLC | TestTEST_CC | TestTEST_CC_OPTS - | TestGhcPackageDbFlag - | TestMinGhcVersion711 - | TestMinGhcVersion801 | TestLeadingUnderscore | TestGhcPackageDb | TestGhcLibDir @@ -72,9 +69,6 @@ testSetting key = do TestLLC -> "LLC" TestTEST_CC -> "TEST_CC" TestTEST_CC_OPTS -> "TEST_CC_OPTS" - TestGhcPackageDbFlag -> "GhcPackageDbFlag" - TestMinGhcVersion711 -> "MinGhcVersion711" - TestMinGhcVersion801 -> "MinGhcVersion801" TestLeadingUnderscore -> "LeadingUnderscore" TestGhcPackageDb -> "GhcGlobalPackageDb" TestGhcLibDir -> "GhcLibdir" diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index a22d9b46d1..f12b579e8d 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -35,25 +35,6 @@ main = do getGhcFieldProgWithDefault fields "TEST_CC" "C compiler command" "gcc" getGhcFieldProgWithDefault fields "TEST_CC_OPTS" "C compiler flags" "" - let pkgdb_flag = case lookup "Project version" fields of - Just v - | parseVersion v >= [7,5] -> "package-db" - _ -> "package-conf" - putStrLn $ "GhcPackageDbFlag" ++ '=':pkgdb_flag - - let minGhcVersion711 = case lookup "Project version" fields of - Just v - | parseVersion v >= [7,11] -> "YES" - _ -> "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 = getGhcField fields mkvar key id (fail ("No field: " ++ key)) diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 56c720f0fd..76a52d5030 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -38,21 +38,17 @@ endif # TEST_HC_OPTS is passed to every invocation of TEST_HC # in nested Makefiles TEST_HC_OPTS = -dcore-lint -dstg-lint -dcmm-lint \ - -no-user-$(GhcPackageDbFlag) -rtsopts $(EXTRA_HC_OPTS) + -no-user-package-db -rtsopts $(EXTRA_HC_OPTS) -ifeq "$(MinGhcVersion711)" "YES" # Don't warn about missing specialisations. They can only occur with `-O`, but # we want tests to produce the same output for all test ways. 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 TEST_HC_OPTS += -fno-diagnostics-show-caret -endif # See #15278. TEST_HC_OPTS += -Werror=compat |