Revert "Only use woops project once in tests"

This reverts commit 585628e.
haskell · Dec 9, 2024 · cdecabe · cdecabe
1 parent 585628e
commit cdecabe
Show file tree

Hide file tree

Showing 2 changed files with 276 additions and 0 deletions.
diff --git 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
@@ -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" ]