Try to adapt testsuite for 71e797e

Author: hvr

cabal-testsuite/PackageTests/CustomDep/cabal.test.hs

@@ -2,6 +2,8 @@ import Test.Cabal.Prelude
 main = cabalTest $ do
     -- NB: This variant seems to use the bootstrapped Cabal?
     skipUnless =<< hasCabalForGhc
+    -- implicit setup-depends conflict with GHC >= 8.2; c.f. #415
+    skipIf =<< (ghcVersionIs (>= mkVersion [8,2]))
     -- This test depends heavily on what packages are in the global
     -- database, don't record the output
     recordMode DoNotRecord $ do

cabal-testsuite/PackageTests/CustomPlain/cabal.test.hs

@@ -1,5 +1,7 @@
 import Test.Cabal.Prelude
 main = cabalTest $ do
+    -- implicit setup-depends conflict with GHC >= 8.2; c.f. #415
+    skipIf =<< (ghcVersionIs (>= mkVersion [8,2]))
     -- Regression test for #4393
     recordMode DoNotRecord $ do
         -- TODO: Hack; see also CustomDep/cabal.test.hs

cabal-testsuite/PackageTests/Regression/T3932/cabal.test.hs

@@ -5,8 +5,11 @@ main = cabalTest $
     -- extra constraint that setup Cabal must be 1.20.  If we don't
     -- have a choice like this available, the unsatisfied constraint
     -- won't be reported.
+    --
+    -- Due to #415, the lower bound may be even higher based on GHC
+    -- version
     withRepo "repo" $ do
         -- Don't record because output wobbles based on installed database.
         recordMode DoNotRecord $ do
             fails (cabal' "new-build" []) >>=
-                assertOutputContains "Setup.hs requires >=1.20"
+                assertOutputContains "Setup.hs requires >="