Redo the test so the project doesn't sort 1st

haskell · Dec 12, 2024 · 493bd34 · 493bd34
1 parent 33d2fcd
commit 493bd34
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/...t/DedupUsingConfigFromSimple/extra.config → ...UsingConfigFromSimple/a-very-extra.config b/...t/DedupUsingConfigFromSimple/extra.config → ...UsingConfigFromSimple/a-very-extra.config
diff --git a/...upUsingConfigFromSimple/very-extra.config → ...edupUsingConfigFromSimple/an-extra.config b/...upUsingConfigFromSimple/very-extra.config → ...edupUsingConfigFromSimple/an-extra.config
diff --git a/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFromSimple/cabal.project b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFromSimple/cabal.project
@@ -1,8 +1,8 @@
 packages: no-pkg-dir
-import: extra.config
-import: extra.config
-import: very-extra.config
-import: very-extra.config
+import: an-extra.config
+import: an-extra.config
+import: a-very-extra.config
+import: a-very-extra.config
 import: https://www.stackage.org/lts-21.25/cabal.config
 import: https://www.stackage.org/lts-21.25/cabal.config
 import: with-ghc.config
diff --git a/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFromSimple/cabal.test.hs b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFromSimple/cabal.test.hs
@@ -14,8 +14,8 @@ main = cabalTest . recordMode RecordMarked $ do
     "Project configuration is listed in full and deduplicated"
     "When using configuration from:(\n|\r\n) \
       \ .*cabal\\.project(\n|\r\n) \
-      \ .*extra\\.config(\n|\r\n) \
-      \ .*very-extra\\.config(\n|\r\n) \
+      \ .*a-very-extra\\.config(\n|\r\n) \
+      \ .*an-extra\\.config(\n|\r\n) \
       \ .*with-ghc\\.config(\n|\r\n) \
       \ .*https://www.stackage.org/lts-21.25/cabal.config(\n|\r\n)"
     out

diff --git a/changelog.d/pr-10546 b/changelog.d/pr-10546
@@ -20,18 +20,18 @@ message.
     ```
     $ cat cabal.project
     packages: no-pkg-dir
-    import: extra.config
-    import: extra.config
-    import: very-extra.config
-    import: very-extra.config
+    import: an-extra.config
+    import: an-extra.config
+    import: a-very-extra.config
+    import: a-very-extra.config
     import: https://www.stackage.org/lts-21.25/cabal.config
     import: https://www.stackage.org/lts-21.25/cabal.config
 
-    $ cat extra.config
+    $ cat an-extra.config
     import: https://www.stackage.org/lts-21.25/cabal.config
     import: https://www.stackage.org/lts-21.25/cabal.config
 
-    $ cat very-extra.config
+    $ cat a-very-extra.config
     import: https://www.stackage.org/lts-21.25/cabal.config
     import: https://www.stackage.org/lts-21.25/cabal.config
     ```
@@ -41,12 +41,13 @@ message.
     ```
     $ ~/.ghcup/bin/cabal-3.12.1.0 build all --dry-run
     When using configuration from:
+    - a-very-extra.config
+    - an-extra.config
     - cabal.project
-    - extra.config
     - https://www.stackage.org/lts-21.25/cabal.config
     - https://www.stackage.org/lts-21.25/cabal.config
     - https://www.stackage.org/lts-21.25/cabal.config
-    - very-extra.config
+    - with-ghc.config
     The following errors occurred:
     - The package location 'no-pkg-dir' does not exist.
     ```
@@ -57,8 +58,9 @@ message.
     $ cabal build all --dry-run
     When using configuration from:
     - cabal.project
-    - extra.config
-    - very-extra.config
+    - a-very-extra.config
+    - an-extra.config
+    - with-ghc.config
     - https://www.stackage.org/lts-21.25/cabal.config
     The following errors occurred:
     - The package location 'no-pkg-dir' does not exist.