Use with-ghc.config with woops project

haskell · Nov 14, 2024 · bc1eaa3 · bc1eaa3
1 parent 208a5b1
commit bc1eaa3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out
@@ -382,6 +382,8 @@ 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:
+- with-ghc.config
+    imported by: woops-0.project
 - woops-0.project
 - woops-2.config
     imported by: woops/woops-1.config
@@ -649,12 +651,7 @@ Configuration is affected by the following files:
     imported by: woops/woops-1.config
     imported by: woops-0.project
 Resolving dependencies...
-Build profile: -w ghc-9.4.8 -O1
-In order, the following will be built:
- - my-0.1 (lib:my) (first run)
-Configuring my-0.1...
-Preprocessing library for my-0.1...
-Building library for my-0.1...
+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
@@ -309,6 +309,7 @@ main = cabalTest . withRepo "repo" . recordMode RecordMarked $ do
     assertRegex
       "Project configuration with URI imports is listed in full"
       "When using configuration from:(\n|\r\n) \
+        \ .*with-ghc\\.config(\n|\r\n) \
         \ .*woops-0\\.project(\n|\r\n) \
         \ .*woops-2\\.config(\n|\r\n) \
         \ .*woops-4\\.config(\n|\r\n) \