Migrate ParserTests to cabal-install/parser-tests

haskell · Aug 22, 2024 · aa8d3bb · aa8d3bb
1 parent ab8d570
commit aa8d3bb
Show file tree

Hide file tree

Showing 21 changed files with 180 additions and 159 deletions.
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -360,6 +360,25 @@ test-suite unit-tests
           tree-diff,
           QuickCheck >= 2.14.3 && <2.16
 
+-- Tests for the project file parser
+test-suite parser-tests
+    import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep
+    default-language: Haskell2010
+    ghc-options: -rtsopts -threaded
+
+    type: exitcode-stdio-1.0
+    main-is: Tests.hs
+    hs-source-dirs: parser-tests
+    build-depends:
+          cabal-install,
+          containers,
+          directory,
+          filepath,
+          network-uri >= 2.6.2.0 && <2.7,
+          tasty >= 1.2.3 && <1.6,
+          tasty-hunit >= 0.10,
+    other-modules:
+      Tests.ParserTests
 
 -- Tests to run with a limited stack and heap size
 -- The test suite name must be keep short cause a longer one

diff --git a/cabal-install/parser-tests/Tests.hs b/cabal-install/parser-tests/Tests.hs
@@ -0,0 +1,7 @@
+module Main where
+
+import Tests.ParserTests (parserTests)
+import Test.Tasty (defaultMain)
+
+main :: IO ()
+main = defaultMain parserTests
diff --git a/...eTests/ProjectConfig/Parsec/cabal.test.hs → ...install/parser-tests/Tests/ParserTests.hs b/...eTests/ProjectConfig/Parsec/cabal.test.hs → ...install/parser-tests/Tests/ParserTests.hs
diff --git a/...c/tests/all-packages-concat/cabal.project → ...s/files/all-packages-concat/cabal.project b/...c/tests/all-packages-concat/cabal.project → ...s/files/all-packages-concat/cabal.project
diff --git a/...ctConfig/Parsec/tests/empty/cabal.project → ...ser-tests/Tests/files/empty/cabal.project b/...ctConfig/Parsec/tests/empty/cabal.project → ...ser-tests/Tests/files/empty/cabal.project
diff --git a/...Parsec/tests/extra-packages/cabal.project → .../Tests/files/extra-packages/cabal.project b/...Parsec/tests/extra-packages/cabal.project → .../Tests/files/extra-packages/cabal.project
diff --git a/...g/Parsec/tests/install-dirs/cabal.project → ...ts/Tests/files/install-dirs/cabal.project b/...g/Parsec/tests/install-dirs/cabal.project → ...ts/Tests/files/install-dirs/cabal.project
diff --git a/.../tests/local-no-index-repos/cabal.project → .../files/local-no-index-repos/cabal.project b/.../tests/local-no-index-repos/cabal.project → .../files/local-no-index-repos/cabal.project
diff --git a/...sec/tests/optional-packages/cabal.project → ...sts/files/optional-packages/cabal.project b/...sec/tests/optional-packages/cabal.project → ...sts/files/optional-packages/cabal.project
diff --git a/...onfig/Parsec/tests/packages/cabal.project → ...-tests/Tests/files/packages/cabal.project b/...onfig/Parsec/tests/packages/cabal.project → ...-tests/Tests/files/packages/cabal.project
diff --git a/...ts/program-locations-concat/cabal.project → ...es/program-locations-concat/cabal.project b/...ts/program-locations-concat/cabal.project → ...es/program-locations-concat/cabal.project
diff --git a/...ests/program-options-concat/cabal.project → ...iles/program-options-concat/cabal.project b/...ests/program-options-concat/cabal.project → ...iles/program-options-concat/cabal.project
diff --git a/...project-config-all-packages/cabal.project → ...project-config-all-packages/cabal.project b/...project-config-all-packages/cabal.project → ...project-config-all-packages/cabal.project
diff --git a/...s/project-config-build-only/cabal.project → ...s/project-config-build-only/cabal.project b/...s/project-config-build-only/cabal.project → ...s/project-config-build-only/cabal.project
diff --git a/...oject-config-local-packages/cabal.project → ...oject-config-local-packages/cabal.project b/...oject-config-local-packages/cabal.project → ...oject-config-local-packages/cabal.project
diff --git a/...tests/project-config-shared/cabal.project → ...files/project-config-shared/cabal.project b/...tests/project-config-shared/cabal.project → ...files/project-config-shared/cabal.project
diff --git a/...ct-config-specific-packages/cabal.project → ...ct-config-specific-packages/cabal.project b/...ct-config-specific-packages/cabal.project → ...ct-config-specific-packages/cabal.project
diff --git a/...g/Parsec/tests/remote-repos/cabal.project → ...ts/Tests/files/remote-repos/cabal.project b/...g/Parsec/tests/remote-repos/cabal.project → ...ts/Tests/files/remote-repos/cabal.project
diff --git a/.../source-repository-packages/cabal.project → .../source-repository-packages/cabal.project b/.../source-repository-packages/cabal.project → .../source-repository-packages/cabal.project
diff --git a/...ts/specific-packages-concat/cabal.project → ...es/specific-packages-concat/cabal.project b/...ts/specific-packages-concat/cabal.project → ...es/specific-packages-concat/cabal.project
diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -126,8 +126,6 @@ executable test-runtime-deps
   build-depends:
     , Cabal
     , Cabal-syntax
-    , cabal-install
-    , cabal-install-solver
     , Cabal-hooks
     , base
     , bytestring
@@ -136,7 +134,6 @@ executable test-runtime-deps
     , directory
     , exceptions
     , filepath
-    , network-uri
     , process
     , time
     , transformers