From 7438ad1197e74cae600e4ae285988715d79ca2ec Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Sat, 3 Mar 2018 13:04:52 +0100
Subject: [PATCH] Fixup T4154 testcase

(cherry picked from commit 86de9cc97bde8da5248de49f0e38e40227259378)
---
 .../Regression/T4154/install-time-with-constraint.out  |  1 -
 .../T4154/install-time-with-constraint.test.hs         | 10 ++++++----
 .../PackageTests/Regression/T4154/time.cabal           |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
index 1f5437704e..de5fbf4bdd 100644
--- a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
+++ b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
@@ -4,5 +4,4 @@ Downloading the latest package list from test-local-repo
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
- - Cabal-99999 (lib) (requires download & build)
  - time-99999 (lib:time) (first run)
diff --git a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.test.hs b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.test.hs
index 54c56fe2ce..59aad8b34e 100644
--- a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.test.hs
+++ b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.test.hs
@@ -9,7 +9,9 @@ main = cabalTest $ withRepo "repo" $ do
 
   -- Temporarily disabled recording here because output is not stable
   recordMode DoNotRecord $ do
-      -- Constraining all uses of 'time' results in a cyclic dependency
-      -- between 'Cabal' and the new 'time'.
-      r <- fails $ cabal' "new-build" ["time", "--constraint=any.time==99999", "--dry-run"]
-      assertOutputContains "cyclic dependencies; conflict set: time:setup.Cabal, time:setup.time" r
+      r <- fails $ cabal' "new-build" ["time", "--constraint=any.time==99999", "--constraint=setup.Cabal installed", "--dry-run"]
+      -- Constraining all uses of 'time' originally resulted in a cyclic dependency
+      -- between 'Cabal' and the new 'time':
+      -- assertOutputContains "cyclic dependencies; conflict set: time:setup.Cabal, time:setup.time" r
+      -- However, this doesn't work anymore, so instead we more directly look for:
+      assertOutputContains "time:setup.time~>time-99999 (conflict: time:setup.Cabal" r
diff --git a/cabal-testsuite/PackageTests/Regression/T4154/time.cabal b/cabal-testsuite/PackageTests/Regression/T4154/time.cabal
index ad72efcdae..ac9899b035 100644
--- a/cabal-testsuite/PackageTests/Regression/T4154/time.cabal
+++ b/cabal-testsuite/PackageTests/Regression/T4154/time.cabal
@@ -4,7 +4,7 @@ cabal-version:   >=1.8
 build-type:      Custom
 
 custom-setup
-  setup-depends: base, Cabal == 99999
+  setup-depends: base, Cabal
 
 library
   build-depends: base
-- 
GitLab