From 80eee17105be486488aa5b104272501e11ca3ee7 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Sat, 10 May 2025 12:43:14 +0300 Subject: [PATCH] Use a small local file instead of fetching one from Stackage --- .../ProjectImport/UntrimmedImport/cabal.config | 2 ++ .../ProjectImport/UntrimmedImport/tabs-and-spaces.project | 3 +-- .../ProjectImport/UntrimmedImport/trailing-space.project | 3 +-- .../ProjectImport/UntrimmedImport/with-ghc.config | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.config delete mode 100644 cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/with-ghc.config diff --git a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.config b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.config new file mode 100644 index 00000000000..e926302cf31 --- /dev/null +++ b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.config @@ -0,0 +1,2 @@ +-- Contents unimportant. This file is just a target for the import statement under test. +with-compiler: ghc diff --git a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/tabs-and-spaces.project b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/tabs-and-spaces.project index 667f4474622..bc2965a45fe 100644 --- a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/tabs-and-spaces.project +++ b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/tabs-and-spaces.project @@ -1,3 +1,2 @@ packages: . -import: https://www.stackage.org/nightly-2024-12-05/cabal.config -import: with-ghc.config +import: cabal.config diff --git a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/trailing-space.project b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/trailing-space.project index 5923d9f7156..07dfc8cf686 100644 --- a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/trailing-space.project +++ b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/trailing-space.project @@ -1,3 +1,2 @@ packages: . -import: https://www.stackage.org/nightly-2024-12-05/cabal.config -import: with-ghc.config +import: cabal.config diff --git a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/with-ghc.config b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/with-ghc.config deleted file mode 100644 index 140a00be1b9..00000000000 --- a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/with-ghc.config +++ /dev/null @@ -1,7 +0,0 @@ --- WARNING: Override the `with-compiler: ghc-x.y.z` of the stackage import, of --- https://www.stackage.org/nightly-yyyy-mm-dd/cabal.config. Otherwise tests --- will fail with: --- -Error: [Cabal-5490] --- -Cannot find the program 'ghc'. User-specified path 'ghc-x.y.z' does not --- refer to an executable and the program is not on the system path. -with-compiler: ghc