Merge pull request #4072 from abooij/pr4065-fixup

Deduplicate version checks in cabal-testsuite

Cabal/doc/developing-packages.rst

@@ -1443,7 +1443,7 @@ executables when the executable is run (or even lazily during
 execution), while static libraries (``.a`` files on Linux/OSX, ``.lib``
 files on Windows) get linked against the executable at compile time.
 
-Foreign libraries only work with GHC 7.4 and later.
+Foreign libraries only work with GHC 7.8 and later.
 
 A typical stanza for a foreign library looks like
 

cabal-testsuite/PackageTests/ForeignLibs/Check.hs

@@ -16,9 +16,9 @@ import Distribution.Version
 
 import PackageTests.PackageTester
 
--- Foreign libraries don't work with GHC 7.2 and earlier
+-- Foreign libraries don't work with GHC 7.6 and earlier
 suite :: TestM ()
-suite = whenGhcVersion (>= mkVersion [7,4]) . withPackageDb $ do
+suite = whenGhcVersion (>= mkVersion [7,8]) . withPackageDb $ do
     cabal_install []
     dist_dir <- distDir
     pkg_dir <- packageDir

cabal-testsuite/PackageTests/Tests.hs

@@ -58,8 +58,7 @@ tests config = do
   tc "AutogenModules/SrcDist" PackageTests.AutogenModules.SrcDist.Check.suite
 
   -- Test that foreign libraries work
-  tc "ForeignLibs" . whenGhcVersion (>= mkVersion [7,8]) $
-    PackageTests.ForeignLibs.Check.suite
+  tc "ForeignLibs" PackageTests.ForeignLibs.Check.suite
 
   ---------------------------------------------------------------------
   -- * Test suite tests