From 505a04af68f95ba1187c319c45924cc3eccaa6cc Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Thu, 21 Nov 2024 11:41:34 -0500 Subject: [PATCH] Update expected output --- .../ConditionalAndImport/cabal.out | 126 +----------------- 1 file changed, 6 insertions(+), 120 deletions(-) diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out index c2690ee4366..df9786ec44c 100644 --- a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out +++ b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out @@ -254,131 +254,17 @@ Could not resolve dependencies: (constraint from oops-0.project requires ==1.4.3.0) [__1] fail (backjumping, conflict set: hashable, oops) After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: hashable (3), oops (2) -# checking if we detect when the same config is imported via many different paths (we don't) +# checking that we detect when the same config is imported via many different paths # cabal v2-build -Configuration is affected by the following files: -- yops-0.project -- yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops-4.config - imported by: yops/yops-3.config - imported by: yops-0.project -- yops-4.config - imported by: yops/yops-3.config - imported by: yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops-6.config - imported by: yops/yops-5.config - imported by: yops-0.project -- yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-0.project -- yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops-8.config - imported by: yops/yops-7.config - imported by: yops-0.project -- yops-8.config - imported by: yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-0.project -- yops-8.config - imported by: yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-0.project -- yops-8.config - imported by: yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops/yops-1.config - imported by: yops-0.project -- yops/yops-3.config - imported by: yops-0.project -- yops/yops-3.config - imported by: yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops/yops-5.config - imported by: yops-0.project -- yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-0.project -- yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops/yops-7.config - imported by: yops-0.project -- yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-0.project -- yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-0.project -- yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config - imported by: yops-2.config - imported by: yops/yops-1.config - imported by: yops-0.project -- yops/yops-9.config - imported by: yops-0.project -- yops/yops-9.config - imported by: yops-8.config - imported by: yops/yops-7.config - imported by: yops-0.project -- yops/yops-9.config - imported by: yops-8.config - imported by: yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-0.project -- yops/yops-9.config - imported by: yops-8.config - imported by: yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config +Error: [Cabal-7090] +Error parsing project file /yops-0.project: +duplicate import of yops/yops-3.config; + yops/yops-3.config imported by: yops-0.project -- yops/yops-9.config - imported by: yops-8.config - imported by: yops/yops-7.config - imported by: yops-6.config - imported by: yops/yops-5.config - imported by: yops-4.config - imported by: yops/yops-3.config + yops/yops-3.config imported by: yops-2.config imported by: yops/yops-1.config imported by: yops-0.project -Up to date # checking bad conditional # cabal v2-build Error: [Cabal-7090]