Merge pull request #3197 from hvr/pr/ghc8-travis

(Try to) add GHC 8.0.1 to the test-matrix

Author: 23Skidoo

.travis.yml

@@ -8,15 +8,16 @@ env:
  - GHCVER=7.6.3
  - GHCVER=7.8.4
  - GHCVER=7.10.3
+ - GHCVER=8.0.1
  # TODO add PARSEC_BUNDLED=YES when it's so
  - GHCVER=head
 
 # Note: the distinction between `before_install` and `install` is not important.
 before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
  - travis_retry sudo apt-get update
- - travis_retry sudo apt-get install cabal-install-1.22 ghc-$GHCVER-prof ghc-$GHCVER-dyn happy
- - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
+ - travis_retry sudo apt-get install cabal-install-1.24 ghc-$GHCVER-prof ghc-$GHCVER-dyn happy
+ - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/1.24/bin:$PATH
  - git version
 
 install:

Cabal/tests/PackageTests/Tests.hs

@@ -115,7 +115,7 @@ tests config = do
       assertRegex "error should be in MyLibrary.hs" "^MyLibrary.hs:" r
       assertRegex
         "error should be \"Could not find module `Text\\.PrettyPrint\""
-        "Could not find module.*Text\\.PrettyPrint" r
+        "(Could not find module|Failed to load interface for).*Text\\.PrettyPrint" r
 
   -- This is a control on TargetSpecificDeps1; it should
   -- succeed.
@@ -130,7 +130,7 @@ tests config = do
       assertRegex "error should be in lemon.hs" "^lemon.hs:" r
       assertRegex
         "error should be \"Could not find module `Text\\.PrettyPrint\""
-        "Could not find module.*Text\\.PrettyPrint" r
+        "(Could not find module|Failed to load interface for).*Text\\.PrettyPrint" r
 
   -- Test that Paths module is generated and available for executables.
   tc "PathsModule/Executable" $ cabal_build []

Cabal/tests/UnitTests/Distribution/System.hs

@@ -9,7 +9,7 @@ import Distribution.System
 import Test.Tasty
 import Test.Tasty.QuickCheck
 
-textRoundtrip :: (Arbitrary a, Show a, Eq a, Text a) => a -> Property
+textRoundtrip :: (Show a, Eq a, Text a) => a -> Property
 textRoundtrip x = simpleParse (display x) === Just x
 
 tests :: [TestTree]
@@ -26,4 +26,4 @@ instance Arbitrary Arch where
     arbitrary = elements knownArches
 
 instance Arbitrary Platform where
-    arbitrary = liftM2 Platform arbitrary arbitrary
+    arbitrary = liftM2 Platform arbitrary arbitrary