From cdecabe22fa3b992f4688966b11cfa58cd7d39c8 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Mon, 9 Dec 2024 09:01:01 -0500 Subject: [PATCH] Revert "Only use woops project once in tests" This reverts commit 585628e8b98ca77259d412cd355e2965d80be1e3. --- .../ConditionalAndImport/cabal.out | 273 ++++++++++++++++++ .../ConditionalAndImport/cabal.test.hs | 3 + 2 files changed, 276 insertions(+) diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out index 2ec76a3b514..323f5e0289e 100644 --- a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out +++ b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out @@ -379,6 +379,279 @@ Configuration is affected by the following files: imported by: yops/yops-1.config imported by: yops-0.project Up to date +# checking if we detect when the same config is imported via many different paths (we don't) +# cabal v2-build +Configuration is affected by the following files: +- woops-0.project +- with-ghc.config + imported by: woops-0.project +- woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops-8.config + imported by: woops/woops-7.config + imported by: woops-0.project +- woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops/woops-1.config + imported by: woops-0.project +- woops/woops-3.config + imported by: woops-0.project +- woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops/woops-5.config + imported by: woops-0.project +- woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops/woops-7.config + imported by: woops-0.project +- woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- woops/woops-9.config + imported by: woops-0.project +- woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-0.project +- woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-5.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-7.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-9.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-0.project +- https://www.stackage.org/lts-21.25/cabal.config + imported by: woops/woops-9.config + imported by: woops-8.config + imported by: woops/woops-7.config + imported by: woops-6.config + imported by: woops/woops-5.config + imported by: woops-4.config + imported by: woops/woops-3.config + imported by: woops-2.config + imported by: woops/woops-1.config + imported by: woops-0.project +Resolving dependencies... +Up to date # checking "using config from message" without URI imports # cabal v2-build # checking "using config from message" with URI imports diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs index 7fb86e9447c..22e16ba23a3 100644 --- a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs +++ b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs @@ -258,6 +258,9 @@ main = cabalTest . withRepo "repo" . recordMode RecordMarked $ do log "checking if we detect when the same config is imported via many different paths (we don't)" yopping <- cabal' "v2-build" [ "--project-file=yops-0.project" ] + log "checking if we detect when the same config is imported via many different paths (we don't)" + woopping <- cabal' "v2-build" [ "--project-file=woops-0.project" ] + log "checking \"using config from message\" without URI imports" withDirectory "yops" $ do yopping <- fails $ cabal' "v2-build" [ "--dry-run", "--project-file=../yops-0.project" ]