From 579bff0cc7b68e33296a12d75152a988f93bea2e Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 13 Oct 2020 12:31:32 +0300 Subject: [PATCH] Move tests from Cabal to Cabal-tests package The are various motivation points: - I'm not aware anyone third party running Cabal tests (maybe nixpkgs?) - No need to do gen-extra-source-files, as Cabal-tests is not distributed - No multiple rebuilds of Cabal-QuickCheck, Cabal-tree-diff - Slightly smaller Cabal sdist (which is quite big still) --- .github/workflows/quick-jobs.yml | 1 - .github/workflows/windows.yml | 10 +- .../Cabal-QuickCheck.cabal | 0 .../src/Test/QuickCheck/GenericArbitrary.hs | 0 .../src/Test/QuickCheck/Instances/Cabal.hs | 0 .../Cabal-described.cabal | 6 + .../src/Distribution/Described.hs | 0 .../src/Distribution/Utils/CharSet.hs | 0 .../src/Distribution/Utils/GrammarRegex.hs | 0 Cabal-tests/Cabal-tests.cabal | 219 ++++++++ Cabal-tests/LICENSE | 34 ++ {Cabal => Cabal-tests}/tests/CheckTests.hs | 0 {Cabal => Cabal-tests}/tests/HackageTests.hs | 0 {Cabal => Cabal-tests}/tests/NoThunks.hs | 11 +- {Cabal => Cabal-tests}/tests/ParserTests.hs | 0 .../tests/ParserTests/errors/MiniAgda.cabal | 0 .../tests/ParserTests/errors/MiniAgda.errors | 0 .../tests/ParserTests/errors/anynone.cabal | 0 .../tests/ParserTests/errors/anynone.errors | 0 .../ParserTests/errors/big-version.cabal | 0 .../ParserTests/errors/big-version.errors | 0 .../tests/ParserTests/errors/common1.cabal | 0 .../tests/ParserTests/errors/common1.errors | 0 .../tests/ParserTests/errors/common2.cabal | 0 .../tests/ParserTests/errors/common2.errors | 0 .../tests/ParserTests/errors/common3.cabal | 0 .../tests/ParserTests/errors/common3.errors | 0 .../ParserTests/errors/forward-compat.cabal | 0 .../ParserTests/errors/forward-compat.errors | 0 .../ParserTests/errors/forward-compat2.cabal | 0 .../ParserTests/errors/forward-compat2.errors | 0 .../ParserTests/errors/forward-compat3.cabal | 0 .../ParserTests/errors/forward-compat3.errors | 0 .../ParserTests/errors/issue-5055-2.cabal | 0 .../ParserTests/errors/issue-5055-2.errors | 0 .../tests/ParserTests/errors/issue-5055.cabal | 0 .../ParserTests/errors/issue-5055.errors | 0 .../ParserTests/errors/leading-comma-2.cabal | 0 .../ParserTests/errors/leading-comma-2.errors | 0 .../ParserTests/errors/leading-comma-2b.cabal | 0 .../errors/leading-comma-2b.errors | 0 .../ParserTests/errors/leading-comma-2c.cabal | 0 .../errors/leading-comma-2c.errors | 0 .../ParserTests/errors/leading-comma.cabal | 0 .../ParserTests/errors/leading-comma.errors | 0 .../tests/ParserTests/errors/libpq1.cabal | 0 .../tests/ParserTests/errors/libpq1.errors | 0 .../tests/ParserTests/errors/libpq2.cabal | 0 .../tests/ParserTests/errors/libpq2.errors | 0 .../tests/ParserTests/errors/mixin-1.cabal | 0 .../tests/ParserTests/errors/mixin-1.errors | 0 .../tests/ParserTests/errors/mixin-2.cabal | 0 .../tests/ParserTests/errors/mixin-2.errors | 0 .../ParserTests/errors/multiple-libs.cabal | 0 .../ParserTests/errors/multiple-libs.errors | 0 .../tests/ParserTests/errors/noVersion.cabal | 0 .../tests/ParserTests/errors/noVersion.errors | 0 .../tests/ParserTests/errors/noVersion2.cabal | 0 .../ParserTests/errors/noVersion2.errors | 0 .../ParserTests/errors/range-ge-wild.cabal | 0 .../ParserTests/errors/range-ge-wild.errors | 0 .../ParserTests/errors/removed-fields.cabal | 0 .../ParserTests/errors/removed-fields.errors | 0 .../tests/ParserTests/errors/spdx-1.cabal | 0 .../tests/ParserTests/errors/spdx-1.errors | 0 .../tests/ParserTests/errors/spdx-2.cabal | 0 .../tests/ParserTests/errors/spdx-2.errors | 0 .../tests/ParserTests/errors/spdx-3.cabal | 0 .../tests/ParserTests/errors/spdx-3.errors | 0 .../ParserTests/errors/undefined-flag.cabal | 0 .../ParserTests/errors/undefined-flag.errors | 0 .../ParserTests/errors/version-sets-1.cabal | 0 .../ParserTests/errors/version-sets-1.errors | 0 .../ParserTests/errors/version-sets-2.cabal | 0 .../ParserTests/errors/version-sets-2.errors | 0 .../ParserTests/errors/version-sets-3.cabal | 0 .../ParserTests/errors/version-sets-3.errors | 0 .../ParserTests/errors/version-sets-4.cabal | 0 .../ParserTests/errors/version-sets-4.errors | 0 .../tests/ParserTests/ipi/Includes2.cabal | 0 .../tests/ParserTests/ipi/Includes2.expr | 0 .../tests/ParserTests/ipi/Includes2.format | 0 .../ipi/internal-preprocessor-test.cabal | 0 .../ipi/internal-preprocessor-test.expr | 0 .../ipi/internal-preprocessor-test.format | 0 .../ParserTests/ipi/issue-2276-ghc-9885.cabal | 0 .../ParserTests/ipi/issue-2276-ghc-9885.expr | 0 .../ipi/issue-2276-ghc-9885.format | 0 .../tests/ParserTests/ipi/transformers.cabal | 0 .../tests/ParserTests/ipi/transformers.expr | 0 .../tests/ParserTests/ipi/transformers.format | 0 .../ParserTests/regressions/Octree-0.5.cabal | 0 .../ParserTests/regressions/Octree-0.5.expr | 0 .../ParserTests/regressions/Octree-0.5.format | 0 .../ParserTests/regressions/anynone.cabal | 0 .../ParserTests/regressions/anynone.expr | 0 .../ParserTests/regressions/anynone.format | 0 .../regressions/assoc-cpp-options.cabal | 0 .../regressions/assoc-cpp-options.check | 0 .../regressions/bad-glob-syntax.cabal | 0 .../regressions/bad-glob-syntax.check | 0 .../ParserTests/regressions/big-version.cabal | 0 .../ParserTests/regressions/big-version.expr | 0 .../regressions/big-version.format | 0 .../cc-options-with-optimization.cabal | 0 .../cc-options-with-optimization.check | 0 .../regressions/common-conditional.cabal | 0 .../regressions/common-conditional.expr | 0 .../regressions/common-conditional.format | 0 .../ParserTests/regressions/common.cabal | 0 .../tests/ParserTests/regressions/common.expr | 0 .../ParserTests/regressions/common.format | 0 .../ParserTests/regressions/common2.cabal | 0 .../ParserTests/regressions/common2.expr | 0 .../ParserTests/regressions/common2.format | 0 .../ParserTests/regressions/common3.cabal | 0 .../ParserTests/regressions/common3.expr | 0 .../ParserTests/regressions/common3.format | 0 .../cxx-options-with-optimization.cabal | 0 .../cxx-options-with-optimization.check | 0 .../tests/ParserTests/regressions/elif.cabal | 0 .../tests/ParserTests/regressions/elif.expr | 0 .../tests/ParserTests/regressions/elif.format | 0 .../tests/ParserTests/regressions/elif2.cabal | 0 .../tests/ParserTests/regressions/elif2.expr | 0 .../ParserTests/regressions/elif2.format | 0 .../regressions/encoding-0.8.cabal | 0 .../ParserTests/regressions/encoding-0.8.expr | 0 .../regressions/encoding-0.8.format | 0 .../regressions/extensions-paths-5054.cabal | 0 .../regressions/extensions-paths-5054.check | 0 .../regressions/generics-sop.cabal | 0 .../ParserTests/regressions/generics-sop.expr | 0 .../regressions/generics-sop.format | 0 .../regressions/ghc-option-j.cabal | 0 .../regressions/ghc-option-j.check | 0 .../haddock-api-2.18.1-check.cabal | 0 .../haddock-api-2.18.1-check.check | 0 .../ParserTests/regressions/hasktorch.cabal | 0 .../ParserTests/regressions/hasktorch.expr | 0 .../ParserTests/regressions/hasktorch.format | 0 .../regressions/hidden-main-lib.cabal | 0 .../regressions/hidden-main-lib.expr | 0 .../regressions/hidden-main-lib.format | 0 .../ParserTests/regressions/indentation.cabal | 0 .../ParserTests/regressions/indentation.expr | 0 .../regressions/indentation.format | 0 .../regressions/indentation2.cabal | 0 .../ParserTests/regressions/indentation2.expr | 0 .../regressions/indentation2.format | 0 .../regressions/indentation3.cabal | 0 .../ParserTests/regressions/indentation3.expr | 0 .../regressions/indentation3.format | 0 .../ParserTests/regressions/issue-5055.cabal | 0 .../ParserTests/regressions/issue-5055.expr | 0 .../ParserTests/regressions/issue-5055.format | 0 .../ParserTests/regressions/issue-5846.cabal | 0 .../ParserTests/regressions/issue-5846.expr | 0 .../ParserTests/regressions/issue-5846.format | 0 .../regressions/issue-6083-a.cabal | 0 .../ParserTests/regressions/issue-6083-a.expr | 0 .../regressions/issue-6083-a.format | 0 .../regressions/issue-6083-b.cabal | 0 .../ParserTests/regressions/issue-6083-b.expr | 0 .../regressions/issue-6083-b.format | 0 .../regressions/issue-6083-c.cabal | 0 .../ParserTests/regressions/issue-6083-c.expr | 0 .../regressions/issue-6083-c.format | 0 .../regressions/issue-6083-pkg-pkg.cabal | 0 .../regressions/issue-6083-pkg-pkg.expr | 0 .../regressions/issue-6083-pkg-pkg.format | 0 .../regressions/issue-6288-a.cabal | 0 .../regressions/issue-6288-a.check | 0 .../regressions/issue-6288-b.cabal | 0 .../regressions/issue-6288-b.check | 0 .../regressions/issue-6288-c.cabal | 0 .../regressions/issue-6288-c.check | 0 .../regressions/issue-6288-d.cabal | 0 .../regressions/issue-6288-d.check | 0 .../regressions/issue-6288-e.cabal | 0 .../regressions/issue-6288-e.check | 0 .../regressions/issue-6288-f.cabal | 0 .../regressions/issue-6288-f.check | 0 .../ParserTests/regressions/issue-774.cabal | 0 .../ParserTests/regressions/issue-774.check | 0 .../ParserTests/regressions/issue-774.expr | 0 .../ParserTests/regressions/issue-774.format | 0 .../regressions/jaeger-flamegraph.cabal | 0 .../regressions/jaeger-flamegraph.expr | 0 .../regressions/jaeger-flamegraph.format | 0 .../regressions/leading-comma-2.cabal | 0 .../regressions/leading-comma-2.expr | 0 .../regressions/leading-comma-2.format | 0 .../regressions/leading-comma.cabal | 0 .../regressions/leading-comma.expr | 0 .../regressions/leading-comma.format | 0 .../ParserTests/regressions/libpq1.cabal | 0 .../tests/ParserTests/regressions/libpq1.expr | 0 .../ParserTests/regressions/libpq1.format | 0 .../ParserTests/regressions/libpq2.cabal | 0 .../tests/ParserTests/regressions/libpq2.expr | 0 .../ParserTests/regressions/libpq2.format | 0 .../ParserTests/regressions/mixin-1.cabal | 0 .../ParserTests/regressions/mixin-1.expr | 0 .../ParserTests/regressions/mixin-1.format | 0 .../ParserTests/regressions/mixin-2.cabal | 0 .../ParserTests/regressions/mixin-2.expr | 0 .../ParserTests/regressions/mixin-2.format | 0 .../ParserTests/regressions/mixin-3.cabal | 0 .../ParserTests/regressions/mixin-3.expr | 0 .../ParserTests/regressions/mixin-3.format | 0 .../ParserTests/regressions/monad-param.cabal | 0 .../ParserTests/regressions/monad-param.expr | 0 .../regressions/monad-param.format | 0 .../regressions/multiple-libs-2.cabal | 0 .../regressions/multiple-libs-2.check | 0 .../regressions/multiple-libs-2.expr | 0 .../regressions/multiple-libs-2.format | 0 .../ParserTests/regressions/noVersion.cabal | 0 .../ParserTests/regressions/noVersion.expr | 0 .../ParserTests/regressions/noVersion.format | 0 .../regressions/nothing-unicode.cabal | 0 .../regressions/nothing-unicode.check | 0 .../regressions/nothing-unicode.expr | 0 .../regressions/nothing-unicode.format | 0 .../regressions/pre-1.6-glob.cabal | 0 .../regressions/pre-1.6-glob.check | 0 .../regressions/pre-2.4-globstar.cabal | 0 .../regressions/pre-2.4-globstar.check | 0 .../regressions/public-multilib-1.cabal | 0 .../regressions/public-multilib-1.check | 0 .../regressions/public-multilib-2.cabal | 0 .../regressions/public-multilib-2.check | 0 .../tests/ParserTests/regressions/shake.cabal | 0 .../tests/ParserTests/regressions/shake.expr | 0 .../ParserTests/regressions/shake.format | 0 .../ParserTests/regressions/spdx-1.cabal | 0 .../tests/ParserTests/regressions/spdx-1.expr | 0 .../ParserTests/regressions/spdx-1.format | 0 .../ParserTests/regressions/spdx-2.cabal | 0 .../tests/ParserTests/regressions/spdx-2.expr | 0 .../ParserTests/regressions/spdx-2.format | 0 .../ParserTests/regressions/spdx-3.cabal | 0 .../tests/ParserTests/regressions/spdx-3.expr | 0 .../ParserTests/regressions/spdx-3.format | 0 .../regressions/th-lift-instances.cabal | 0 .../regressions/th-lift-instances.expr | 0 .../regressions/th-lift-instances.format | 0 .../regressions/version-sets.cabal | 0 .../ParserTests/regressions/version-sets.expr | 0 .../regressions/version-sets.format | 0 .../regressions/wl-pprint-indef.cabal | 0 .../regressions/wl-pprint-indef.expr | 0 .../regressions/wl-pprint-indef.format | 0 .../tests/ParserTests/warnings/bom.cabal | 0 .../tests/ParserTests/warnings/bool.cabal | 0 .../warnings/deprecatedfield.cabal | 0 .../ParserTests/warnings/doubledash.cabal | 0 .../warnings/extratestmodule.cabal | 0 .../tests/ParserTests/warnings/gluedop.cabal | 0 .../warnings/multiplesingular.cabal | 0 .../tests/ParserTests/warnings/nbsp.cabal | 0 .../ParserTests/warnings/newsyntax.cabal | 0 .../ParserTests/warnings/oldsyntax.cabal | 0 .../tests/ParserTests/warnings/operator.cabal | 0 .../ParserTests/warnings/specversion-a.cabal | 0 .../ParserTests/warnings/specversion-b.cabal | 0 .../ParserTests/warnings/specversion-c.cabal | 0 .../ParserTests/warnings/subsection.cabal | 0 .../tests/ParserTests/warnings/tab.cabal | 0 .../ParserTests/warnings/trailingfield.cabal | 0 .../ParserTests/warnings/unknownfield.cabal | 0 .../ParserTests/warnings/unknownsection.cabal | 0 .../tests/ParserTests/warnings/utf8.cabal | 0 .../ParserTests/warnings/versiontag.cabal | 0 .../tests/ParserTests/warnings/wildcard.cabal | 0 {Cabal => Cabal-tests}/tests/README.md | 0 {Cabal => Cabal-tests}/tests/RPMVerCmp.hs | 0 {Cabal => Cabal-tests}/tests/Test/Laws.hs | 0 .../tests/Test/QuickCheck/Utils.hs | 0 {Cabal => Cabal-tests}/tests/UnitTests.hs | 0 .../Distribution/CabalSpecVersion.hs | 0 .../Distribution/Compat/CreatePipe.hs | 0 .../UnitTests/Distribution/Compat/Graph.hs | 0 .../UnitTests/Distribution/Compat/Time.hs | 0 .../tests/UnitTests/Distribution/Described.hs | 0 .../Distribution/PkgconfigVersion.hs | 0 .../tests/UnitTests/Distribution/SPDX.hs | 0 .../UnitTests/Distribution/Simple/Glob.hs | 0 .../Distribution/Simple/Program/GHC.hs | 0 .../Distribution/Simple/Program/Internal.hs | 0 .../UnitTests/Distribution/Simple/Utils.hs | 0 .../tests/UnitTests/Distribution/System.hs | 13 +- .../Types/GenericPackageDescription.hs | 0 .../UnitTests/Distribution/Utils/CharSet.hs | 0 .../UnitTests/Distribution/Utils/Generic.hs | 0 .../UnitTests/Distribution/Utils/NubList.hs | 0 .../UnitTests/Distribution/Utils/ShortText.hs | 0 .../Distribution/Utils/Structured.hs | 0 .../tests/UnitTests/Distribution/Version.hs | 0 .../tests/UnitTests/Orphans.hs | 0 .../tests/cbits/rpmvercmp.c | 0 .../tests/custom-setup/CabalDoctestSetup.hs | 0 .../tests/custom-setup/CustomSetupTests.hs | 0 .../tests/custom-setup/IdrisSetup.hs | 0 {Cabal => Cabal-tests}/tests/hackage/check.sh | 0 .../tests/hackage/download.sh | 0 .../tests/hackage/unpack.sh | 0 .../tests/misc/ghc-supported-languages.hs | 0 .../Cabal-tree-diff.cabal | 0 .../src/Data/TreeDiff/Instances/Cabal.hs | 0 .../Data/TreeDiff/Instances/CabalLanguage.hs | 0 .../src/Data/TreeDiff/Instances/CabalSPDX.hs | 0 .../Data/TreeDiff/Instances/CabalVersion.hs | 0 Cabal/Cabal.cabal | 493 +----------------- Makefile | 10 +- appveyor.yml | 6 +- cabal-dev-scripts/cabal-dev-scripts.cabal | 12 - cabal-dev-scripts/src/GenExtraSourceFiles.hs | 121 ----- cabal.project | 7 +- cabal.project.buildinfo | 2 +- cabal.project.validate | 8 +- cabal.project.validate.libonly | 4 + templates/ci-quick-jobs.template.yml | 1 - templates/ci-windows.template.yml | 5 +- validate.sh | 34 +- 326 files changed, 323 insertions(+), 674 deletions(-) rename {Cabal/Cabal-QuickCheck => Cabal-QuickCheck}/Cabal-QuickCheck.cabal (100%) rename {Cabal/Cabal-QuickCheck => Cabal-QuickCheck}/src/Test/QuickCheck/GenericArbitrary.hs (100%) rename {Cabal/Cabal-QuickCheck => Cabal-QuickCheck}/src/Test/QuickCheck/Instances/Cabal.hs (100%) rename {Cabal/Cabal-described => Cabal-described}/Cabal-described.cabal (84%) rename {Cabal/Cabal-described => Cabal-described}/src/Distribution/Described.hs (100%) rename {Cabal/Cabal-described => Cabal-described}/src/Distribution/Utils/CharSet.hs (100%) rename {Cabal/Cabal-described => Cabal-described}/src/Distribution/Utils/GrammarRegex.hs (100%) create mode 100644 Cabal-tests/Cabal-tests.cabal create mode 100644 Cabal-tests/LICENSE rename {Cabal => Cabal-tests}/tests/CheckTests.hs (100%) rename {Cabal => Cabal-tests}/tests/HackageTests.hs (100%) rename {Cabal => Cabal-tests}/tests/NoThunks.hs (94%) rename {Cabal => Cabal-tests}/tests/ParserTests.hs (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/MiniAgda.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/MiniAgda.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/anynone.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/anynone.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/big-version.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/big-version.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/common1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/common1.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/common2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/common2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/common3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/common3.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/forward-compat.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/forward-compat.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/forward-compat2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/forward-compat2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/forward-compat3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/forward-compat3.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/issue-5055-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/issue-5055-2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/issue-5055.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/issue-5055.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma-2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma-2b.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma-2b.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma-2c.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma-2c.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/leading-comma.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/libpq1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/libpq1.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/libpq2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/libpq2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/mixin-1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/mixin-1.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/mixin-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/mixin-2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/multiple-libs.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/multiple-libs.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/noVersion.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/noVersion.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/noVersion2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/noVersion2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/range-ge-wild.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/range-ge-wild.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/removed-fields.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/removed-fields.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/spdx-1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/spdx-1.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/spdx-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/spdx-2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/spdx-3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/spdx-3.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/undefined-flag.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/undefined-flag.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-1.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-2.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-3.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-4.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/errors/version-sets-4.errors (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/Includes2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/Includes2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/Includes2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/internal-preprocessor-test.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/internal-preprocessor-test.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/internal-preprocessor-test.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/issue-2276-ghc-9885.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/issue-2276-ghc-9885.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/transformers.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/transformers.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/ipi/transformers.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/Octree-0.5.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/Octree-0.5.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/Octree-0.5.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/anynone.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/anynone.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/anynone.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/assoc-cpp-options.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/assoc-cpp-options.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/bad-glob-syntax.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/bad-glob-syntax.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/big-version.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/big-version.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/big-version.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/cc-options-with-optimization.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/cc-options-with-optimization.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common-conditional.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common-conditional.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common-conditional.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common3.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/common3.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/cxx-options-with-optimization.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/cxx-options-with-optimization.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/elif.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/elif.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/elif.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/elif2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/elif2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/elif2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/encoding-0.8.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/encoding-0.8.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/encoding-0.8.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/extensions-paths-5054.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/extensions-paths-5054.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/generics-sop.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/generics-sop.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/generics-sop.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/ghc-option-j.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/ghc-option-j.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/haddock-api-2.18.1-check.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/hasktorch.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/hasktorch.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/hasktorch.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/hidden-main-lib.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/hidden-main-lib.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/hidden-main-lib.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation3.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/indentation3.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-5055.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-5055.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-5055.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-5846.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-5846.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-5846.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-a.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-a.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-a.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-b.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-b.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-b.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-c.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-c.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-c.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6083-pkg-pkg.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-a.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-a.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-b.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-b.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-c.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-c.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-d.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-d.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-e.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-e.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-f.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-6288-f.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-774.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-774.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-774.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/issue-774.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/jaeger-flamegraph.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/jaeger-flamegraph.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/jaeger-flamegraph.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/leading-comma-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/leading-comma-2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/leading-comma-2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/leading-comma.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/leading-comma.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/leading-comma.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/libpq1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/libpq1.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/libpq1.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/libpq2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/libpq2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/libpq2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-1.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-1.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-3.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/mixin-3.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/monad-param.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/monad-param.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/monad-param.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/multiple-libs-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/multiple-libs-2.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/multiple-libs-2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/multiple-libs-2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/noVersion.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/noVersion.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/noVersion.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/nothing-unicode.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/nothing-unicode.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/nothing-unicode.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/nothing-unicode.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/pre-1.6-glob.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/pre-1.6-glob.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/pre-2.4-globstar.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/pre-2.4-globstar.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/public-multilib-1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/public-multilib-1.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/public-multilib-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/public-multilib-2.check (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/shake.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/shake.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/shake.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-1.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-1.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-1.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-2.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-2.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-2.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-3.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-3.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/spdx-3.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/th-lift-instances.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/th-lift-instances.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/th-lift-instances.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/version-sets.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/version-sets.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/version-sets.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/wl-pprint-indef.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/wl-pprint-indef.expr (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/regressions/wl-pprint-indef.format (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/bom.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/bool.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/deprecatedfield.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/doubledash.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/extratestmodule.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/gluedop.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/multiplesingular.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/nbsp.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/newsyntax.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/oldsyntax.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/operator.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/specversion-a.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/specversion-b.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/specversion-c.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/subsection.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/tab.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/trailingfield.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/unknownfield.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/unknownsection.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/utf8.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/versiontag.cabal (100%) rename {Cabal => Cabal-tests}/tests/ParserTests/warnings/wildcard.cabal (100%) rename {Cabal => Cabal-tests}/tests/README.md (100%) rename {Cabal => Cabal-tests}/tests/RPMVerCmp.hs (100%) rename {Cabal => Cabal-tests}/tests/Test/Laws.hs (100%) rename {Cabal => Cabal-tests}/tests/Test/QuickCheck/Utils.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/CabalSpecVersion.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Compat/CreatePipe.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Compat/Graph.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Compat/Time.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Described.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/PkgconfigVersion.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/SPDX.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Simple/Glob.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Simple/Program/GHC.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Simple/Program/Internal.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Simple/Utils.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/System.hs (72%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Types/GenericPackageDescription.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Utils/CharSet.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Utils/Generic.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Utils/NubList.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Utils/ShortText.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Utils/Structured.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Distribution/Version.hs (100%) rename {Cabal => Cabal-tests}/tests/UnitTests/Orphans.hs (100%) rename {Cabal => Cabal-tests}/tests/cbits/rpmvercmp.c (100%) rename {Cabal => Cabal-tests}/tests/custom-setup/CabalDoctestSetup.hs (100%) rename {Cabal => Cabal-tests}/tests/custom-setup/CustomSetupTests.hs (100%) rename {Cabal => Cabal-tests}/tests/custom-setup/IdrisSetup.hs (100%) rename {Cabal => Cabal-tests}/tests/hackage/check.sh (100%) rename {Cabal => Cabal-tests}/tests/hackage/download.sh (100%) rename {Cabal => Cabal-tests}/tests/hackage/unpack.sh (100%) rename {Cabal => Cabal-tests}/tests/misc/ghc-supported-languages.hs (100%) rename {Cabal/Cabal-tree-diff => Cabal-tree-diff}/Cabal-tree-diff.cabal (100%) rename {Cabal/Cabal-tree-diff => Cabal-tree-diff}/src/Data/TreeDiff/Instances/Cabal.hs (100%) rename {Cabal/Cabal-tree-diff => Cabal-tree-diff}/src/Data/TreeDiff/Instances/CabalLanguage.hs (100%) rename {Cabal/Cabal-tree-diff => Cabal-tree-diff}/src/Data/TreeDiff/Instances/CabalSPDX.hs (100%) rename {Cabal/Cabal-tree-diff => Cabal-tree-diff}/src/Data/TreeDiff/Instances/CabalVersion.hs (100%) delete mode 100644 cabal-dev-scripts/src/GenExtraSourceFiles.hs diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml index 0cc086ad402..d151237cc54 100644 --- a/.github/workflows/quick-jobs.yml +++ b/.github/workflows/quick-jobs.yml @@ -39,7 +39,6 @@ jobs: - name: Regenerate files run: | make lexer - make gen-extra-source-files make spdx make templates make github-actions diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 79a7502d003..9fe163a1345 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -54,6 +54,9 @@ jobs: run: cabal v2-build Cabal --only-dependencies - name: cabal v2-build run: cabal v2-build all + - name: Cabal unit-tests + run: | + cabal v2-test Cabal-tests - name: cabal-install memory-usage-tests run: | cd cabal-install @@ -72,7 +75,7 @@ jobs: cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)" - name: cabal-tests # Using only one job, -j1, to fail less. - run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe + run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe test-windows-8_8_4: name: test ghc-8.8.4 runs-on: windows-latest @@ -109,6 +112,9 @@ jobs: run: cabal v2-build Cabal --only-dependencies - name: cabal v2-build run: cabal v2-build all + - name: Cabal unit-tests + run: | + cabal v2-test Cabal-tests - name: cabal-install memory-usage-tests run: | cd cabal-install @@ -127,4 +133,4 @@ jobs: cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)" - name: cabal-tests # Using only one job, -j1, to fail less. - run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.8.4\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe + run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.8.4\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe diff --git a/Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal similarity index 100% rename from Cabal/Cabal-QuickCheck/Cabal-QuickCheck.cabal rename to Cabal-QuickCheck/Cabal-QuickCheck.cabal diff --git a/Cabal/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs b/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs similarity index 100% rename from Cabal/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs rename to Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs diff --git a/Cabal/Cabal-QuickCheck/src/Test/QuickCheck/Instances/Cabal.hs b/Cabal-QuickCheck/src/Test/QuickCheck/Instances/Cabal.hs similarity index 100% rename from Cabal/Cabal-QuickCheck/src/Test/QuickCheck/Instances/Cabal.hs rename to Cabal-QuickCheck/src/Test/QuickCheck/Instances/Cabal.hs diff --git a/Cabal/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal similarity index 84% rename from Cabal/Cabal-described/Cabal-described.cabal rename to Cabal-described/Cabal-described.cabal index e31cc40583b..74c6a69614c 100644 --- a/Cabal/Cabal-described/Cabal-described.cabal +++ b/Cabal-described/Cabal-described.cabal @@ -20,6 +20,12 @@ library , tasty-quickcheck , transformers + if !impl(ghc >=7.10) + build-depends: void + + if !impl(ghc >=7.8) + build-depends: tagged ^>=0.8.5 + exposed-modules: Distribution.Described Distribution.Utils.CharSet diff --git a/Cabal/Cabal-described/src/Distribution/Described.hs b/Cabal-described/src/Distribution/Described.hs similarity index 100% rename from Cabal/Cabal-described/src/Distribution/Described.hs rename to Cabal-described/src/Distribution/Described.hs diff --git a/Cabal/Cabal-described/src/Distribution/Utils/CharSet.hs b/Cabal-described/src/Distribution/Utils/CharSet.hs similarity index 100% rename from Cabal/Cabal-described/src/Distribution/Utils/CharSet.hs rename to Cabal-described/src/Distribution/Utils/CharSet.hs diff --git a/Cabal/Cabal-described/src/Distribution/Utils/GrammarRegex.hs b/Cabal-described/src/Distribution/Utils/GrammarRegex.hs similarity index 100% rename from Cabal/Cabal-described/src/Distribution/Utils/GrammarRegex.hs rename to Cabal-described/src/Distribution/Utils/GrammarRegex.hs diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal new file mode 100644 index 00000000000..0e74388e16e --- /dev/null +++ b/Cabal-tests/Cabal-tests.cabal @@ -0,0 +1,219 @@ +cabal-version: >=1.10 +name: Cabal-tests +version: 3 +copyright: 2003-2020, Cabal Development Team (see AUTHORS file) +license: BSD3 +license-file: LICENSE +author: Cabal Development Team +maintainer: cabal-devel@haskell.org +homepage: http://www.haskell.org/cabal/ +bug-reports: https://github.com/haskell/cabal/issues +synopsis: Tests for Cabal library +description: The tests are external for development flows convinience. +category: Distribution +build-type: Simple + +source-repository head + type: git + location: https://github.com/haskell/cabal/ + subdir: Cabal-tests + +-- Small, fast running tests. +test-suite unit-tests + type: exitcode-stdio-1.0 + hs-source-dirs: tests + other-modules: + Test.Laws + Test.QuickCheck.Utils + UnitTests.Distribution.CabalSpecVersion + UnitTests.Distribution.Compat.CreatePipe + UnitTests.Distribution.Compat.Graph + UnitTests.Distribution.Compat.Time + UnitTests.Distribution.Described + UnitTests.Distribution.PkgconfigVersion + UnitTests.Distribution.Simple.Glob + UnitTests.Distribution.Simple.Program.GHC + UnitTests.Distribution.Simple.Program.Internal + UnitTests.Distribution.Simple.Utils + UnitTests.Distribution.SPDX + UnitTests.Distribution.System + UnitTests.Distribution.Types.GenericPackageDescription + UnitTests.Distribution.Utils.CharSet + UnitTests.Distribution.Utils.Generic + UnitTests.Distribution.Utils.NubList + UnitTests.Distribution.Utils.ShortText + UnitTests.Distribution.Utils.Structured + UnitTests.Distribution.Version + UnitTests.Orphans + + main-is: UnitTests.hs + build-depends: + array + , async >=2.2.2 && <2.3 + , base >=0 && <5 + , binary + , bytestring + , Cabal + , Cabal-described + , Cabal-QuickCheck + , containers + , deepseq + , Diff >=0.4 && <0.5 + , directory + , filepath + , integer-logarithms >=1.0.2 && <1.1 + , pretty + , QuickCheck >=2.14 && <2.15 + , rere >=0.1 && <0.2 + , tagged + , tasty >=1.2.3 && <1.4 + , tasty-hunit + , tasty-quickcheck + , temporary + , text + , transformers + + ghc-options: -Wall + default-language: Haskell2010 + + if !impl(ghc >=7.10) + build-depends: void + + if !impl(ghc >=8.0) + build-depends: semigroups + +test-suite parser-tests + type: exitcode-stdio-1.0 + hs-source-dirs: tests + main-is: ParserTests.hs + build-depends: + base + , base-compat >=0.11.0 && <0.12 + , bytestring + , Cabal + , Cabal-tree-diff + , Diff >=0.4 && <0.5 + , directory + , filepath + , tasty >=1.2.3 && <1.4 + , tasty-golden >=2.3.1.1 && <2.4 + , tasty-hunit + , tasty-quickcheck + + ghc-options: -Wall + default-language: Haskell2010 + + if !impl(ghc >=8.0) + build-depends: semigroups + + if impl(ghc >=7.8) + build-depends: tree-diff ==0.1.* + +test-suite check-tests + type: exitcode-stdio-1.0 + hs-source-dirs: tests + main-is: CheckTests.hs + build-depends: + base + , bytestring + , Cabal + , Diff >=0.4 && <0.5 + , directory + , filepath + , tasty >=1.2.3 && <1.4 + , tasty-golden >=2.3.1.1 && <2.4 + + ghc-options: -Wall + default-language: Haskell2010 + + if !impl(ghc >=8.0) + build-depends: semigroups + +test-suite custom-setup-tests + type: exitcode-stdio-1.0 + hs-source-dirs: tests/custom-setup + main-is: CustomSetupTests.hs + other-modules: + CabalDoctestSetup + IdrisSetup + + build-depends: + base + , Cabal + , directory + , filepath + , process + + default-language: Haskell2010 + +test-suite hackage-tests + type: exitcode-stdio-1.0 + main-is: HackageTests.hs + + -- TODO: need to get 01-index.tar on appveyor + if os(windows) + buildable: False + + hs-source-dirs: tests + build-depends: + base + , bytestring + , Cabal + , Cabal-tree-diff + , containers + , deepseq + , directory + , filepath + + build-depends: + base-compat >=0.11.0 && <0.12 + , base-orphans >=0.6 && <0.9 + , clock >=0.8 && <0.9 + , optparse-applicative >=0.13.2.0 && <0.17 + , stm >=2.4.5.0 && <2.6 + , tar >=0.5.0.3 && <0.6 + + if impl(ghc >=7.8) + build-depends: tree-diff ==0.1.* + + ghc-options: -Wall -rtsopts -threaded + default-extensions: CPP + default-language: Haskell2010 + +test-suite rpmvercmp + type: exitcode-stdio-1.0 + main-is: RPMVerCmp.hs + hs-source-dirs: tests + build-depends: + base + , bytestring + , Cabal + + build-depends: + QuickCheck + , tasty >=1.2.3 && <1.4 + , tasty-hunit + , tasty-quickcheck + + c-sources: tests/cbits/rpmvercmp.c + cc-options: -Wall + ghc-options: -Wall + default-language: Haskell2010 + +test-suite no-thunks-test + default-language: Haskell2010 + ghc-options: -Wall + type: exitcode-stdio-1.0 + main-is: NoThunks.hs + hs-source-dirs: tests + build-depends: + base + , bytestring + , Cabal + , tasty >=1.2.3 && <1.4 + , tasty-hunit + + -- this is test is buildable on old GHCs + -- but it doesn't do anything. + if impl(ghc >=8.6) + build-depends: nothunks >=0.1.1.0 && <0.2 diff --git a/Cabal-tests/LICENSE b/Cabal-tests/LICENSE new file mode 100644 index 00000000000..d311ab42e10 --- /dev/null +++ b/Cabal-tests/LICENSE @@ -0,0 +1,34 @@ +Copyright (c) 2003-2020, Cabal Development Team. +See the AUTHORS file for the full list of copyright holders. + +See */LICENSE for the copyright holders of the subcomponents. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Isaac Jones nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Cabal/tests/CheckTests.hs b/Cabal-tests/tests/CheckTests.hs similarity index 100% rename from Cabal/tests/CheckTests.hs rename to Cabal-tests/tests/CheckTests.hs diff --git a/Cabal/tests/HackageTests.hs b/Cabal-tests/tests/HackageTests.hs similarity index 100% rename from Cabal/tests/HackageTests.hs rename to Cabal-tests/tests/HackageTests.hs diff --git a/Cabal/tests/NoThunks.hs b/Cabal-tests/tests/NoThunks.hs similarity index 94% rename from Cabal/tests/NoThunks.hs rename to Cabal-tests/tests/NoThunks.hs index 1523407cf2c..9a743fe4d08 100644 --- a/Cabal/tests/NoThunks.hs +++ b/Cabal-tests/tests/NoThunks.hs @@ -1,3 +1,10 @@ +{-# LANGUAGE CPP #-} +#if !(__GLASGOW_HASKELL__ >= 806 && defined(MIN_VERSION_nothunks)) +module Main (main) where +main :: IO () +main = putStrLn "Old GHC, no nothunks" +#else + {-# LANGUAGE DerivingVia #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ScopedTypeVariables #-} @@ -36,7 +43,7 @@ main = defaultMain $ testGroup "nothunks" noThunksParse :: IO () noThunksParse = do - bs <- BS.readFile "Cabal/Cabal.cabal" <|> BS.readFile "Cabal.cabal" + bs <- BS.readFile "Cabal/Cabal.cabal" <|> BS.readFile "../Cabal/Cabal.cabal" let res = parseGenericPackageDescription bs gpd <- either (assertFailure . show) return $ snd $ runParseResult res @@ -130,3 +137,5 @@ newtype CheckFoldableNamed f a = CheckFoldableNamed (f a) instance (NoThunks a, Foldable f, Typeable f) => NoThunks (CheckFoldableNamed f a) where showTypeOf _ = show (typeRep (Proxy :: Proxy f)) wNoThunks ctxt (CheckFoldableNamed xs) = noThunksInValues ctxt (toList xs) + +#endif diff --git a/Cabal/tests/ParserTests.hs b/Cabal-tests/tests/ParserTests.hs similarity index 100% rename from Cabal/tests/ParserTests.hs rename to Cabal-tests/tests/ParserTests.hs diff --git a/Cabal/tests/ParserTests/errors/MiniAgda.cabal b/Cabal-tests/tests/ParserTests/errors/MiniAgda.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/MiniAgda.cabal rename to Cabal-tests/tests/ParserTests/errors/MiniAgda.cabal diff --git a/Cabal/tests/ParserTests/errors/MiniAgda.errors b/Cabal-tests/tests/ParserTests/errors/MiniAgda.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/MiniAgda.errors rename to Cabal-tests/tests/ParserTests/errors/MiniAgda.errors diff --git a/Cabal/tests/ParserTests/errors/anynone.cabal b/Cabal-tests/tests/ParserTests/errors/anynone.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/anynone.cabal rename to Cabal-tests/tests/ParserTests/errors/anynone.cabal diff --git a/Cabal/tests/ParserTests/errors/anynone.errors b/Cabal-tests/tests/ParserTests/errors/anynone.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/anynone.errors rename to Cabal-tests/tests/ParserTests/errors/anynone.errors diff --git a/Cabal/tests/ParserTests/errors/big-version.cabal b/Cabal-tests/tests/ParserTests/errors/big-version.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/big-version.cabal rename to Cabal-tests/tests/ParserTests/errors/big-version.cabal diff --git a/Cabal/tests/ParserTests/errors/big-version.errors b/Cabal-tests/tests/ParserTests/errors/big-version.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/big-version.errors rename to Cabal-tests/tests/ParserTests/errors/big-version.errors diff --git a/Cabal/tests/ParserTests/errors/common1.cabal b/Cabal-tests/tests/ParserTests/errors/common1.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/common1.cabal rename to Cabal-tests/tests/ParserTests/errors/common1.cabal diff --git a/Cabal/tests/ParserTests/errors/common1.errors b/Cabal-tests/tests/ParserTests/errors/common1.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/common1.errors rename to Cabal-tests/tests/ParserTests/errors/common1.errors diff --git a/Cabal/tests/ParserTests/errors/common2.cabal b/Cabal-tests/tests/ParserTests/errors/common2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/common2.cabal rename to Cabal-tests/tests/ParserTests/errors/common2.cabal diff --git a/Cabal/tests/ParserTests/errors/common2.errors b/Cabal-tests/tests/ParserTests/errors/common2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/common2.errors rename to Cabal-tests/tests/ParserTests/errors/common2.errors diff --git a/Cabal/tests/ParserTests/errors/common3.cabal b/Cabal-tests/tests/ParserTests/errors/common3.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/common3.cabal rename to Cabal-tests/tests/ParserTests/errors/common3.cabal diff --git a/Cabal/tests/ParserTests/errors/common3.errors b/Cabal-tests/tests/ParserTests/errors/common3.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/common3.errors rename to Cabal-tests/tests/ParserTests/errors/common3.errors diff --git a/Cabal/tests/ParserTests/errors/forward-compat.cabal b/Cabal-tests/tests/ParserTests/errors/forward-compat.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/forward-compat.cabal rename to Cabal-tests/tests/ParserTests/errors/forward-compat.cabal diff --git a/Cabal/tests/ParserTests/errors/forward-compat.errors b/Cabal-tests/tests/ParserTests/errors/forward-compat.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/forward-compat.errors rename to Cabal-tests/tests/ParserTests/errors/forward-compat.errors diff --git a/Cabal/tests/ParserTests/errors/forward-compat2.cabal b/Cabal-tests/tests/ParserTests/errors/forward-compat2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/forward-compat2.cabal rename to Cabal-tests/tests/ParserTests/errors/forward-compat2.cabal diff --git a/Cabal/tests/ParserTests/errors/forward-compat2.errors b/Cabal-tests/tests/ParserTests/errors/forward-compat2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/forward-compat2.errors rename to Cabal-tests/tests/ParserTests/errors/forward-compat2.errors diff --git a/Cabal/tests/ParserTests/errors/forward-compat3.cabal b/Cabal-tests/tests/ParserTests/errors/forward-compat3.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/forward-compat3.cabal rename to Cabal-tests/tests/ParserTests/errors/forward-compat3.cabal diff --git a/Cabal/tests/ParserTests/errors/forward-compat3.errors b/Cabal-tests/tests/ParserTests/errors/forward-compat3.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/forward-compat3.errors rename to Cabal-tests/tests/ParserTests/errors/forward-compat3.errors diff --git a/Cabal/tests/ParserTests/errors/issue-5055-2.cabal b/Cabal-tests/tests/ParserTests/errors/issue-5055-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/issue-5055-2.cabal rename to Cabal-tests/tests/ParserTests/errors/issue-5055-2.cabal diff --git a/Cabal/tests/ParserTests/errors/issue-5055-2.errors b/Cabal-tests/tests/ParserTests/errors/issue-5055-2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/issue-5055-2.errors rename to Cabal-tests/tests/ParserTests/errors/issue-5055-2.errors diff --git a/Cabal/tests/ParserTests/errors/issue-5055.cabal b/Cabal-tests/tests/ParserTests/errors/issue-5055.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/issue-5055.cabal rename to Cabal-tests/tests/ParserTests/errors/issue-5055.cabal diff --git a/Cabal/tests/ParserTests/errors/issue-5055.errors b/Cabal-tests/tests/ParserTests/errors/issue-5055.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/issue-5055.errors rename to Cabal-tests/tests/ParserTests/errors/issue-5055.errors diff --git a/Cabal/tests/ParserTests/errors/leading-comma-2.cabal b/Cabal-tests/tests/ParserTests/errors/leading-comma-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma-2.cabal rename to Cabal-tests/tests/ParserTests/errors/leading-comma-2.cabal diff --git a/Cabal/tests/ParserTests/errors/leading-comma-2.errors b/Cabal-tests/tests/ParserTests/errors/leading-comma-2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma-2.errors rename to Cabal-tests/tests/ParserTests/errors/leading-comma-2.errors diff --git a/Cabal/tests/ParserTests/errors/leading-comma-2b.cabal b/Cabal-tests/tests/ParserTests/errors/leading-comma-2b.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma-2b.cabal rename to Cabal-tests/tests/ParserTests/errors/leading-comma-2b.cabal diff --git a/Cabal/tests/ParserTests/errors/leading-comma-2b.errors b/Cabal-tests/tests/ParserTests/errors/leading-comma-2b.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma-2b.errors rename to Cabal-tests/tests/ParserTests/errors/leading-comma-2b.errors diff --git a/Cabal/tests/ParserTests/errors/leading-comma-2c.cabal b/Cabal-tests/tests/ParserTests/errors/leading-comma-2c.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma-2c.cabal rename to Cabal-tests/tests/ParserTests/errors/leading-comma-2c.cabal diff --git a/Cabal/tests/ParserTests/errors/leading-comma-2c.errors b/Cabal-tests/tests/ParserTests/errors/leading-comma-2c.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma-2c.errors rename to Cabal-tests/tests/ParserTests/errors/leading-comma-2c.errors diff --git a/Cabal/tests/ParserTests/errors/leading-comma.cabal b/Cabal-tests/tests/ParserTests/errors/leading-comma.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma.cabal rename to Cabal-tests/tests/ParserTests/errors/leading-comma.cabal diff --git a/Cabal/tests/ParserTests/errors/leading-comma.errors b/Cabal-tests/tests/ParserTests/errors/leading-comma.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/leading-comma.errors rename to Cabal-tests/tests/ParserTests/errors/leading-comma.errors diff --git a/Cabal/tests/ParserTests/errors/libpq1.cabal b/Cabal-tests/tests/ParserTests/errors/libpq1.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/libpq1.cabal rename to Cabal-tests/tests/ParserTests/errors/libpq1.cabal diff --git a/Cabal/tests/ParserTests/errors/libpq1.errors b/Cabal-tests/tests/ParserTests/errors/libpq1.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/libpq1.errors rename to Cabal-tests/tests/ParserTests/errors/libpq1.errors diff --git a/Cabal/tests/ParserTests/errors/libpq2.cabal b/Cabal-tests/tests/ParserTests/errors/libpq2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/libpq2.cabal rename to Cabal-tests/tests/ParserTests/errors/libpq2.cabal diff --git a/Cabal/tests/ParserTests/errors/libpq2.errors b/Cabal-tests/tests/ParserTests/errors/libpq2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/libpq2.errors rename to Cabal-tests/tests/ParserTests/errors/libpq2.errors diff --git a/Cabal/tests/ParserTests/errors/mixin-1.cabal b/Cabal-tests/tests/ParserTests/errors/mixin-1.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/mixin-1.cabal rename to Cabal-tests/tests/ParserTests/errors/mixin-1.cabal diff --git a/Cabal/tests/ParserTests/errors/mixin-1.errors b/Cabal-tests/tests/ParserTests/errors/mixin-1.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/mixin-1.errors rename to Cabal-tests/tests/ParserTests/errors/mixin-1.errors diff --git a/Cabal/tests/ParserTests/errors/mixin-2.cabal b/Cabal-tests/tests/ParserTests/errors/mixin-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/mixin-2.cabal rename to Cabal-tests/tests/ParserTests/errors/mixin-2.cabal diff --git a/Cabal/tests/ParserTests/errors/mixin-2.errors b/Cabal-tests/tests/ParserTests/errors/mixin-2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/mixin-2.errors rename to Cabal-tests/tests/ParserTests/errors/mixin-2.errors diff --git a/Cabal/tests/ParserTests/errors/multiple-libs.cabal b/Cabal-tests/tests/ParserTests/errors/multiple-libs.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/multiple-libs.cabal rename to Cabal-tests/tests/ParserTests/errors/multiple-libs.cabal diff --git a/Cabal/tests/ParserTests/errors/multiple-libs.errors b/Cabal-tests/tests/ParserTests/errors/multiple-libs.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/multiple-libs.errors rename to Cabal-tests/tests/ParserTests/errors/multiple-libs.errors diff --git a/Cabal/tests/ParserTests/errors/noVersion.cabal b/Cabal-tests/tests/ParserTests/errors/noVersion.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/noVersion.cabal rename to Cabal-tests/tests/ParserTests/errors/noVersion.cabal diff --git a/Cabal/tests/ParserTests/errors/noVersion.errors b/Cabal-tests/tests/ParserTests/errors/noVersion.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/noVersion.errors rename to Cabal-tests/tests/ParserTests/errors/noVersion.errors diff --git a/Cabal/tests/ParserTests/errors/noVersion2.cabal b/Cabal-tests/tests/ParserTests/errors/noVersion2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/noVersion2.cabal rename to Cabal-tests/tests/ParserTests/errors/noVersion2.cabal diff --git a/Cabal/tests/ParserTests/errors/noVersion2.errors b/Cabal-tests/tests/ParserTests/errors/noVersion2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/noVersion2.errors rename to Cabal-tests/tests/ParserTests/errors/noVersion2.errors diff --git a/Cabal/tests/ParserTests/errors/range-ge-wild.cabal b/Cabal-tests/tests/ParserTests/errors/range-ge-wild.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/range-ge-wild.cabal rename to Cabal-tests/tests/ParserTests/errors/range-ge-wild.cabal diff --git a/Cabal/tests/ParserTests/errors/range-ge-wild.errors b/Cabal-tests/tests/ParserTests/errors/range-ge-wild.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/range-ge-wild.errors rename to Cabal-tests/tests/ParserTests/errors/range-ge-wild.errors diff --git a/Cabal/tests/ParserTests/errors/removed-fields.cabal b/Cabal-tests/tests/ParserTests/errors/removed-fields.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/removed-fields.cabal rename to Cabal-tests/tests/ParserTests/errors/removed-fields.cabal diff --git a/Cabal/tests/ParserTests/errors/removed-fields.errors b/Cabal-tests/tests/ParserTests/errors/removed-fields.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/removed-fields.errors rename to Cabal-tests/tests/ParserTests/errors/removed-fields.errors diff --git a/Cabal/tests/ParserTests/errors/spdx-1.cabal b/Cabal-tests/tests/ParserTests/errors/spdx-1.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/spdx-1.cabal rename to Cabal-tests/tests/ParserTests/errors/spdx-1.cabal diff --git a/Cabal/tests/ParserTests/errors/spdx-1.errors b/Cabal-tests/tests/ParserTests/errors/spdx-1.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/spdx-1.errors rename to Cabal-tests/tests/ParserTests/errors/spdx-1.errors diff --git a/Cabal/tests/ParserTests/errors/spdx-2.cabal b/Cabal-tests/tests/ParserTests/errors/spdx-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/spdx-2.cabal rename to Cabal-tests/tests/ParserTests/errors/spdx-2.cabal diff --git a/Cabal/tests/ParserTests/errors/spdx-2.errors b/Cabal-tests/tests/ParserTests/errors/spdx-2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/spdx-2.errors rename to Cabal-tests/tests/ParserTests/errors/spdx-2.errors diff --git a/Cabal/tests/ParserTests/errors/spdx-3.cabal b/Cabal-tests/tests/ParserTests/errors/spdx-3.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/spdx-3.cabal rename to Cabal-tests/tests/ParserTests/errors/spdx-3.cabal diff --git a/Cabal/tests/ParserTests/errors/spdx-3.errors b/Cabal-tests/tests/ParserTests/errors/spdx-3.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/spdx-3.errors rename to Cabal-tests/tests/ParserTests/errors/spdx-3.errors diff --git a/Cabal/tests/ParserTests/errors/undefined-flag.cabal b/Cabal-tests/tests/ParserTests/errors/undefined-flag.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/undefined-flag.cabal rename to Cabal-tests/tests/ParserTests/errors/undefined-flag.cabal diff --git a/Cabal/tests/ParserTests/errors/undefined-flag.errors b/Cabal-tests/tests/ParserTests/errors/undefined-flag.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/undefined-flag.errors rename to Cabal-tests/tests/ParserTests/errors/undefined-flag.errors diff --git a/Cabal/tests/ParserTests/errors/version-sets-1.cabal b/Cabal-tests/tests/ParserTests/errors/version-sets-1.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-1.cabal rename to Cabal-tests/tests/ParserTests/errors/version-sets-1.cabal diff --git a/Cabal/tests/ParserTests/errors/version-sets-1.errors b/Cabal-tests/tests/ParserTests/errors/version-sets-1.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-1.errors rename to Cabal-tests/tests/ParserTests/errors/version-sets-1.errors diff --git a/Cabal/tests/ParserTests/errors/version-sets-2.cabal b/Cabal-tests/tests/ParserTests/errors/version-sets-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-2.cabal rename to Cabal-tests/tests/ParserTests/errors/version-sets-2.cabal diff --git a/Cabal/tests/ParserTests/errors/version-sets-2.errors b/Cabal-tests/tests/ParserTests/errors/version-sets-2.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-2.errors rename to Cabal-tests/tests/ParserTests/errors/version-sets-2.errors diff --git a/Cabal/tests/ParserTests/errors/version-sets-3.cabal b/Cabal-tests/tests/ParserTests/errors/version-sets-3.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-3.cabal rename to Cabal-tests/tests/ParserTests/errors/version-sets-3.cabal diff --git a/Cabal/tests/ParserTests/errors/version-sets-3.errors b/Cabal-tests/tests/ParserTests/errors/version-sets-3.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-3.errors rename to Cabal-tests/tests/ParserTests/errors/version-sets-3.errors diff --git a/Cabal/tests/ParserTests/errors/version-sets-4.cabal b/Cabal-tests/tests/ParserTests/errors/version-sets-4.cabal similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-4.cabal rename to Cabal-tests/tests/ParserTests/errors/version-sets-4.cabal diff --git a/Cabal/tests/ParserTests/errors/version-sets-4.errors b/Cabal-tests/tests/ParserTests/errors/version-sets-4.errors similarity index 100% rename from Cabal/tests/ParserTests/errors/version-sets-4.errors rename to Cabal-tests/tests/ParserTests/errors/version-sets-4.errors diff --git a/Cabal/tests/ParserTests/ipi/Includes2.cabal b/Cabal-tests/tests/ParserTests/ipi/Includes2.cabal similarity index 100% rename from Cabal/tests/ParserTests/ipi/Includes2.cabal rename to Cabal-tests/tests/ParserTests/ipi/Includes2.cabal diff --git a/Cabal/tests/ParserTests/ipi/Includes2.expr b/Cabal-tests/tests/ParserTests/ipi/Includes2.expr similarity index 100% rename from Cabal/tests/ParserTests/ipi/Includes2.expr rename to Cabal-tests/tests/ParserTests/ipi/Includes2.expr diff --git a/Cabal/tests/ParserTests/ipi/Includes2.format b/Cabal-tests/tests/ParserTests/ipi/Includes2.format similarity index 100% rename from Cabal/tests/ParserTests/ipi/Includes2.format rename to Cabal-tests/tests/ParserTests/ipi/Includes2.format diff --git a/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.cabal b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.cabal similarity index 100% rename from Cabal/tests/ParserTests/ipi/internal-preprocessor-test.cabal rename to Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.cabal diff --git a/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.expr b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr similarity index 100% rename from Cabal/tests/ParserTests/ipi/internal-preprocessor-test.expr rename to Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr diff --git a/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.format b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.format similarity index 100% rename from Cabal/tests/ParserTests/ipi/internal-preprocessor-test.format rename to Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.format diff --git a/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal similarity index 100% rename from Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal rename to Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal diff --git a/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.expr b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr similarity index 100% rename from Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.expr rename to Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr diff --git a/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.format b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.format similarity index 100% rename from Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.format rename to Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.format diff --git a/Cabal/tests/ParserTests/ipi/transformers.cabal b/Cabal-tests/tests/ParserTests/ipi/transformers.cabal similarity index 100% rename from Cabal/tests/ParserTests/ipi/transformers.cabal rename to Cabal-tests/tests/ParserTests/ipi/transformers.cabal diff --git a/Cabal/tests/ParserTests/ipi/transformers.expr b/Cabal-tests/tests/ParserTests/ipi/transformers.expr similarity index 100% rename from Cabal/tests/ParserTests/ipi/transformers.expr rename to Cabal-tests/tests/ParserTests/ipi/transformers.expr diff --git a/Cabal/tests/ParserTests/ipi/transformers.format b/Cabal-tests/tests/ParserTests/ipi/transformers.format similarity index 100% rename from Cabal/tests/ParserTests/ipi/transformers.format rename to Cabal-tests/tests/ParserTests/ipi/transformers.format diff --git a/Cabal/tests/ParserTests/regressions/Octree-0.5.cabal b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/Octree-0.5.cabal rename to Cabal-tests/tests/ParserTests/regressions/Octree-0.5.cabal diff --git a/Cabal/tests/ParserTests/regressions/Octree-0.5.expr b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/Octree-0.5.expr rename to Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr diff --git a/Cabal/tests/ParserTests/regressions/Octree-0.5.format b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/Octree-0.5.format rename to Cabal-tests/tests/ParserTests/regressions/Octree-0.5.format diff --git a/Cabal/tests/ParserTests/regressions/anynone.cabal b/Cabal-tests/tests/ParserTests/regressions/anynone.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/anynone.cabal rename to Cabal-tests/tests/ParserTests/regressions/anynone.cabal diff --git a/Cabal/tests/ParserTests/regressions/anynone.expr b/Cabal-tests/tests/ParserTests/regressions/anynone.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/anynone.expr rename to Cabal-tests/tests/ParserTests/regressions/anynone.expr diff --git a/Cabal/tests/ParserTests/regressions/anynone.format b/Cabal-tests/tests/ParserTests/regressions/anynone.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/anynone.format rename to Cabal-tests/tests/ParserTests/regressions/anynone.format diff --git a/Cabal/tests/ParserTests/regressions/assoc-cpp-options.cabal b/Cabal-tests/tests/ParserTests/regressions/assoc-cpp-options.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/assoc-cpp-options.cabal rename to Cabal-tests/tests/ParserTests/regressions/assoc-cpp-options.cabal diff --git a/Cabal/tests/ParserTests/regressions/assoc-cpp-options.check b/Cabal-tests/tests/ParserTests/regressions/assoc-cpp-options.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/assoc-cpp-options.check rename to Cabal-tests/tests/ParserTests/regressions/assoc-cpp-options.check diff --git a/Cabal/tests/ParserTests/regressions/bad-glob-syntax.cabal b/Cabal-tests/tests/ParserTests/regressions/bad-glob-syntax.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/bad-glob-syntax.cabal rename to Cabal-tests/tests/ParserTests/regressions/bad-glob-syntax.cabal diff --git a/Cabal/tests/ParserTests/regressions/bad-glob-syntax.check b/Cabal-tests/tests/ParserTests/regressions/bad-glob-syntax.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/bad-glob-syntax.check rename to Cabal-tests/tests/ParserTests/regressions/bad-glob-syntax.check diff --git a/Cabal/tests/ParserTests/regressions/big-version.cabal b/Cabal-tests/tests/ParserTests/regressions/big-version.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/big-version.cabal rename to Cabal-tests/tests/ParserTests/regressions/big-version.cabal diff --git a/Cabal/tests/ParserTests/regressions/big-version.expr b/Cabal-tests/tests/ParserTests/regressions/big-version.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/big-version.expr rename to Cabal-tests/tests/ParserTests/regressions/big-version.expr diff --git a/Cabal/tests/ParserTests/regressions/big-version.format b/Cabal-tests/tests/ParserTests/regressions/big-version.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/big-version.format rename to Cabal-tests/tests/ParserTests/regressions/big-version.format diff --git a/Cabal/tests/ParserTests/regressions/cc-options-with-optimization.cabal b/Cabal-tests/tests/ParserTests/regressions/cc-options-with-optimization.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/cc-options-with-optimization.cabal rename to Cabal-tests/tests/ParserTests/regressions/cc-options-with-optimization.cabal diff --git a/Cabal/tests/ParserTests/regressions/cc-options-with-optimization.check b/Cabal-tests/tests/ParserTests/regressions/cc-options-with-optimization.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/cc-options-with-optimization.check rename to Cabal-tests/tests/ParserTests/regressions/cc-options-with-optimization.check diff --git a/Cabal/tests/ParserTests/regressions/common-conditional.cabal b/Cabal-tests/tests/ParserTests/regressions/common-conditional.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/common-conditional.cabal rename to Cabal-tests/tests/ParserTests/regressions/common-conditional.cabal diff --git a/Cabal/tests/ParserTests/regressions/common-conditional.expr b/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/common-conditional.expr rename to Cabal-tests/tests/ParserTests/regressions/common-conditional.expr diff --git a/Cabal/tests/ParserTests/regressions/common-conditional.format b/Cabal-tests/tests/ParserTests/regressions/common-conditional.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/common-conditional.format rename to Cabal-tests/tests/ParserTests/regressions/common-conditional.format diff --git a/Cabal/tests/ParserTests/regressions/common.cabal b/Cabal-tests/tests/ParserTests/regressions/common.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/common.cabal rename to Cabal-tests/tests/ParserTests/regressions/common.cabal diff --git a/Cabal/tests/ParserTests/regressions/common.expr b/Cabal-tests/tests/ParserTests/regressions/common.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/common.expr rename to Cabal-tests/tests/ParserTests/regressions/common.expr diff --git a/Cabal/tests/ParserTests/regressions/common.format b/Cabal-tests/tests/ParserTests/regressions/common.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/common.format rename to Cabal-tests/tests/ParserTests/regressions/common.format diff --git a/Cabal/tests/ParserTests/regressions/common2.cabal b/Cabal-tests/tests/ParserTests/regressions/common2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/common2.cabal rename to Cabal-tests/tests/ParserTests/regressions/common2.cabal diff --git a/Cabal/tests/ParserTests/regressions/common2.expr b/Cabal-tests/tests/ParserTests/regressions/common2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/common2.expr rename to Cabal-tests/tests/ParserTests/regressions/common2.expr diff --git a/Cabal/tests/ParserTests/regressions/common2.format b/Cabal-tests/tests/ParserTests/regressions/common2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/common2.format rename to Cabal-tests/tests/ParserTests/regressions/common2.format diff --git a/Cabal/tests/ParserTests/regressions/common3.cabal b/Cabal-tests/tests/ParserTests/regressions/common3.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/common3.cabal rename to Cabal-tests/tests/ParserTests/regressions/common3.cabal diff --git a/Cabal/tests/ParserTests/regressions/common3.expr b/Cabal-tests/tests/ParserTests/regressions/common3.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/common3.expr rename to Cabal-tests/tests/ParserTests/regressions/common3.expr diff --git a/Cabal/tests/ParserTests/regressions/common3.format b/Cabal-tests/tests/ParserTests/regressions/common3.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/common3.format rename to Cabal-tests/tests/ParserTests/regressions/common3.format diff --git a/Cabal/tests/ParserTests/regressions/cxx-options-with-optimization.cabal b/Cabal-tests/tests/ParserTests/regressions/cxx-options-with-optimization.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/cxx-options-with-optimization.cabal rename to Cabal-tests/tests/ParserTests/regressions/cxx-options-with-optimization.cabal diff --git a/Cabal/tests/ParserTests/regressions/cxx-options-with-optimization.check b/Cabal-tests/tests/ParserTests/regressions/cxx-options-with-optimization.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/cxx-options-with-optimization.check rename to Cabal-tests/tests/ParserTests/regressions/cxx-options-with-optimization.check diff --git a/Cabal/tests/ParserTests/regressions/elif.cabal b/Cabal-tests/tests/ParserTests/regressions/elif.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/elif.cabal rename to Cabal-tests/tests/ParserTests/regressions/elif.cabal diff --git a/Cabal/tests/ParserTests/regressions/elif.expr b/Cabal-tests/tests/ParserTests/regressions/elif.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/elif.expr rename to Cabal-tests/tests/ParserTests/regressions/elif.expr diff --git a/Cabal/tests/ParserTests/regressions/elif.format b/Cabal-tests/tests/ParserTests/regressions/elif.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/elif.format rename to Cabal-tests/tests/ParserTests/regressions/elif.format diff --git a/Cabal/tests/ParserTests/regressions/elif2.cabal b/Cabal-tests/tests/ParserTests/regressions/elif2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/elif2.cabal rename to Cabal-tests/tests/ParserTests/regressions/elif2.cabal diff --git a/Cabal/tests/ParserTests/regressions/elif2.expr b/Cabal-tests/tests/ParserTests/regressions/elif2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/elif2.expr rename to Cabal-tests/tests/ParserTests/regressions/elif2.expr diff --git a/Cabal/tests/ParserTests/regressions/elif2.format b/Cabal-tests/tests/ParserTests/regressions/elif2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/elif2.format rename to Cabal-tests/tests/ParserTests/regressions/elif2.format diff --git a/Cabal/tests/ParserTests/regressions/encoding-0.8.cabal b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/encoding-0.8.cabal rename to Cabal-tests/tests/ParserTests/regressions/encoding-0.8.cabal diff --git a/Cabal/tests/ParserTests/regressions/encoding-0.8.expr b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/encoding-0.8.expr rename to Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr diff --git a/Cabal/tests/ParserTests/regressions/encoding-0.8.format b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/encoding-0.8.format rename to Cabal-tests/tests/ParserTests/regressions/encoding-0.8.format diff --git a/Cabal/tests/ParserTests/regressions/extensions-paths-5054.cabal b/Cabal-tests/tests/ParserTests/regressions/extensions-paths-5054.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/extensions-paths-5054.cabal rename to Cabal-tests/tests/ParserTests/regressions/extensions-paths-5054.cabal diff --git a/Cabal/tests/ParserTests/regressions/extensions-paths-5054.check b/Cabal-tests/tests/ParserTests/regressions/extensions-paths-5054.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/extensions-paths-5054.check rename to Cabal-tests/tests/ParserTests/regressions/extensions-paths-5054.check diff --git a/Cabal/tests/ParserTests/regressions/generics-sop.cabal b/Cabal-tests/tests/ParserTests/regressions/generics-sop.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/generics-sop.cabal rename to Cabal-tests/tests/ParserTests/regressions/generics-sop.cabal diff --git a/Cabal/tests/ParserTests/regressions/generics-sop.expr b/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/generics-sop.expr rename to Cabal-tests/tests/ParserTests/regressions/generics-sop.expr diff --git a/Cabal/tests/ParserTests/regressions/generics-sop.format b/Cabal-tests/tests/ParserTests/regressions/generics-sop.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/generics-sop.format rename to Cabal-tests/tests/ParserTests/regressions/generics-sop.format diff --git a/Cabal/tests/ParserTests/regressions/ghc-option-j.cabal b/Cabal-tests/tests/ParserTests/regressions/ghc-option-j.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/ghc-option-j.cabal rename to Cabal-tests/tests/ParserTests/regressions/ghc-option-j.cabal diff --git a/Cabal/tests/ParserTests/regressions/ghc-option-j.check b/Cabal-tests/tests/ParserTests/regressions/ghc-option-j.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/ghc-option-j.check rename to Cabal-tests/tests/ParserTests/regressions/ghc-option-j.check diff --git a/Cabal/tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal b/Cabal-tests/tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal rename to Cabal-tests/tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal diff --git a/Cabal/tests/ParserTests/regressions/haddock-api-2.18.1-check.check b/Cabal-tests/tests/ParserTests/regressions/haddock-api-2.18.1-check.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/haddock-api-2.18.1-check.check rename to Cabal-tests/tests/ParserTests/regressions/haddock-api-2.18.1-check.check diff --git a/Cabal/tests/ParserTests/regressions/hasktorch.cabal b/Cabal-tests/tests/ParserTests/regressions/hasktorch.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/hasktorch.cabal rename to Cabal-tests/tests/ParserTests/regressions/hasktorch.cabal diff --git a/Cabal/tests/ParserTests/regressions/hasktorch.expr b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/hasktorch.expr rename to Cabal-tests/tests/ParserTests/regressions/hasktorch.expr diff --git a/Cabal/tests/ParserTests/regressions/hasktorch.format b/Cabal-tests/tests/ParserTests/regressions/hasktorch.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/hasktorch.format rename to Cabal-tests/tests/ParserTests/regressions/hasktorch.format diff --git a/Cabal/tests/ParserTests/regressions/hidden-main-lib.cabal b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/hidden-main-lib.cabal rename to Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.cabal diff --git a/Cabal/tests/ParserTests/regressions/hidden-main-lib.expr b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/hidden-main-lib.expr rename to Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr diff --git a/Cabal/tests/ParserTests/regressions/hidden-main-lib.format b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/hidden-main-lib.format rename to Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.format diff --git a/Cabal/tests/ParserTests/regressions/indentation.cabal b/Cabal-tests/tests/ParserTests/regressions/indentation.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation.cabal rename to Cabal-tests/tests/ParserTests/regressions/indentation.cabal diff --git a/Cabal/tests/ParserTests/regressions/indentation.expr b/Cabal-tests/tests/ParserTests/regressions/indentation.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation.expr rename to Cabal-tests/tests/ParserTests/regressions/indentation.expr diff --git a/Cabal/tests/ParserTests/regressions/indentation.format b/Cabal-tests/tests/ParserTests/regressions/indentation.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation.format rename to Cabal-tests/tests/ParserTests/regressions/indentation.format diff --git a/Cabal/tests/ParserTests/regressions/indentation2.cabal b/Cabal-tests/tests/ParserTests/regressions/indentation2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation2.cabal rename to Cabal-tests/tests/ParserTests/regressions/indentation2.cabal diff --git a/Cabal/tests/ParserTests/regressions/indentation2.expr b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation2.expr rename to Cabal-tests/tests/ParserTests/regressions/indentation2.expr diff --git a/Cabal/tests/ParserTests/regressions/indentation2.format b/Cabal-tests/tests/ParserTests/regressions/indentation2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation2.format rename to Cabal-tests/tests/ParserTests/regressions/indentation2.format diff --git a/Cabal/tests/ParserTests/regressions/indentation3.cabal b/Cabal-tests/tests/ParserTests/regressions/indentation3.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation3.cabal rename to Cabal-tests/tests/ParserTests/regressions/indentation3.cabal diff --git a/Cabal/tests/ParserTests/regressions/indentation3.expr b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation3.expr rename to Cabal-tests/tests/ParserTests/regressions/indentation3.expr diff --git a/Cabal/tests/ParserTests/regressions/indentation3.format b/Cabal-tests/tests/ParserTests/regressions/indentation3.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/indentation3.format rename to Cabal-tests/tests/ParserTests/regressions/indentation3.format diff --git a/Cabal/tests/ParserTests/regressions/issue-5055.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-5055.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-5055.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-5055.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-5055.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-5055.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-5055.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-5055.format b/Cabal-tests/tests/ParserTests/regressions/issue-5055.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-5055.format rename to Cabal-tests/tests/ParserTests/regressions/issue-5055.format diff --git a/Cabal/tests/ParserTests/regressions/issue-5846.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-5846.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-5846.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-5846.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-5846.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-5846.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-5846.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-5846.format b/Cabal-tests/tests/ParserTests/regressions/issue-5846.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-5846.format rename to Cabal-tests/tests/ParserTests/regressions/issue-5846.format diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-a.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-a.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-a.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-a.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-a.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-a.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-a.format rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-a.format diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-b.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-b.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-b.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-b.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-b.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-b.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-b.format rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-b.format diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-c.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-c.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-c.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-c.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-c.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-c.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-c.format rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-c.format diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6083-pkg-pkg.format rename to Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.format diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-a.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6288-a.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-a.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-a.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-a.check b/Cabal-tests/tests/ParserTests/regressions/issue-6288-a.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-a.check rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-a.check diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-b.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6288-b.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-b.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-b.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-b.check b/Cabal-tests/tests/ParserTests/regressions/issue-6288-b.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-b.check rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-b.check diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-c.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6288-c.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-c.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-c.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-c.check b/Cabal-tests/tests/ParserTests/regressions/issue-6288-c.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-c.check rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-c.check diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-d.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6288-d.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-d.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-d.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-d.check b/Cabal-tests/tests/ParserTests/regressions/issue-6288-d.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-d.check rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-d.check diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-e.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6288-e.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-e.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-e.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-e.check b/Cabal-tests/tests/ParserTests/regressions/issue-6288-e.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-e.check rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-e.check diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-f.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-6288-f.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-f.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-f.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-6288-f.check b/Cabal-tests/tests/ParserTests/regressions/issue-6288-f.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-6288-f.check rename to Cabal-tests/tests/ParserTests/regressions/issue-6288-f.check diff --git a/Cabal/tests/ParserTests/regressions/issue-774.cabal b/Cabal-tests/tests/ParserTests/regressions/issue-774.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-774.cabal rename to Cabal-tests/tests/ParserTests/regressions/issue-774.cabal diff --git a/Cabal/tests/ParserTests/regressions/issue-774.check b/Cabal-tests/tests/ParserTests/regressions/issue-774.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-774.check rename to Cabal-tests/tests/ParserTests/regressions/issue-774.check diff --git a/Cabal/tests/ParserTests/regressions/issue-774.expr b/Cabal-tests/tests/ParserTests/regressions/issue-774.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-774.expr rename to Cabal-tests/tests/ParserTests/regressions/issue-774.expr diff --git a/Cabal/tests/ParserTests/regressions/issue-774.format b/Cabal-tests/tests/ParserTests/regressions/issue-774.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/issue-774.format rename to Cabal-tests/tests/ParserTests/regressions/issue-774.format diff --git a/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.cabal b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/jaeger-flamegraph.cabal rename to Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.cabal diff --git a/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.expr b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/jaeger-flamegraph.expr rename to Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr diff --git a/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.format b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/jaeger-flamegraph.format rename to Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.format diff --git a/Cabal/tests/ParserTests/regressions/leading-comma-2.cabal b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/leading-comma-2.cabal rename to Cabal-tests/tests/ParserTests/regressions/leading-comma-2.cabal diff --git a/Cabal/tests/ParserTests/regressions/leading-comma-2.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/leading-comma-2.expr rename to Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr diff --git a/Cabal/tests/ParserTests/regressions/leading-comma-2.format b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/leading-comma-2.format rename to Cabal-tests/tests/ParserTests/regressions/leading-comma-2.format diff --git a/Cabal/tests/ParserTests/regressions/leading-comma.cabal b/Cabal-tests/tests/ParserTests/regressions/leading-comma.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/leading-comma.cabal rename to Cabal-tests/tests/ParserTests/regressions/leading-comma.cabal diff --git a/Cabal/tests/ParserTests/regressions/leading-comma.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/leading-comma.expr rename to Cabal-tests/tests/ParserTests/regressions/leading-comma.expr diff --git a/Cabal/tests/ParserTests/regressions/leading-comma.format b/Cabal-tests/tests/ParserTests/regressions/leading-comma.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/leading-comma.format rename to Cabal-tests/tests/ParserTests/regressions/leading-comma.format diff --git a/Cabal/tests/ParserTests/regressions/libpq1.cabal b/Cabal-tests/tests/ParserTests/regressions/libpq1.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/libpq1.cabal rename to Cabal-tests/tests/ParserTests/regressions/libpq1.cabal diff --git a/Cabal/tests/ParserTests/regressions/libpq1.expr b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/libpq1.expr rename to Cabal-tests/tests/ParserTests/regressions/libpq1.expr diff --git a/Cabal/tests/ParserTests/regressions/libpq1.format b/Cabal-tests/tests/ParserTests/regressions/libpq1.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/libpq1.format rename to Cabal-tests/tests/ParserTests/regressions/libpq1.format diff --git a/Cabal/tests/ParserTests/regressions/libpq2.cabal b/Cabal-tests/tests/ParserTests/regressions/libpq2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/libpq2.cabal rename to Cabal-tests/tests/ParserTests/regressions/libpq2.cabal diff --git a/Cabal/tests/ParserTests/regressions/libpq2.expr b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/libpq2.expr rename to Cabal-tests/tests/ParserTests/regressions/libpq2.expr diff --git a/Cabal/tests/ParserTests/regressions/libpq2.format b/Cabal-tests/tests/ParserTests/regressions/libpq2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/libpq2.format rename to Cabal-tests/tests/ParserTests/regressions/libpq2.format diff --git a/Cabal/tests/ParserTests/regressions/mixin-1.cabal b/Cabal-tests/tests/ParserTests/regressions/mixin-1.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-1.cabal rename to Cabal-tests/tests/ParserTests/regressions/mixin-1.cabal diff --git a/Cabal/tests/ParserTests/regressions/mixin-1.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-1.expr rename to Cabal-tests/tests/ParserTests/regressions/mixin-1.expr diff --git a/Cabal/tests/ParserTests/regressions/mixin-1.format b/Cabal-tests/tests/ParserTests/regressions/mixin-1.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-1.format rename to Cabal-tests/tests/ParserTests/regressions/mixin-1.format diff --git a/Cabal/tests/ParserTests/regressions/mixin-2.cabal b/Cabal-tests/tests/ParserTests/regressions/mixin-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-2.cabal rename to Cabal-tests/tests/ParserTests/regressions/mixin-2.cabal diff --git a/Cabal/tests/ParserTests/regressions/mixin-2.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-2.expr rename to Cabal-tests/tests/ParserTests/regressions/mixin-2.expr diff --git a/Cabal/tests/ParserTests/regressions/mixin-2.format b/Cabal-tests/tests/ParserTests/regressions/mixin-2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-2.format rename to Cabal-tests/tests/ParserTests/regressions/mixin-2.format diff --git a/Cabal/tests/ParserTests/regressions/mixin-3.cabal b/Cabal-tests/tests/ParserTests/regressions/mixin-3.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-3.cabal rename to Cabal-tests/tests/ParserTests/regressions/mixin-3.cabal diff --git a/Cabal/tests/ParserTests/regressions/mixin-3.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-3.expr rename to Cabal-tests/tests/ParserTests/regressions/mixin-3.expr diff --git a/Cabal/tests/ParserTests/regressions/mixin-3.format b/Cabal-tests/tests/ParserTests/regressions/mixin-3.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/mixin-3.format rename to Cabal-tests/tests/ParserTests/regressions/mixin-3.format diff --git a/Cabal/tests/ParserTests/regressions/monad-param.cabal b/Cabal-tests/tests/ParserTests/regressions/monad-param.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/monad-param.cabal rename to Cabal-tests/tests/ParserTests/regressions/monad-param.cabal diff --git a/Cabal/tests/ParserTests/regressions/monad-param.expr b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/monad-param.expr rename to Cabal-tests/tests/ParserTests/regressions/monad-param.expr diff --git a/Cabal/tests/ParserTests/regressions/monad-param.format b/Cabal-tests/tests/ParserTests/regressions/monad-param.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/monad-param.format rename to Cabal-tests/tests/ParserTests/regressions/monad-param.format diff --git a/Cabal/tests/ParserTests/regressions/multiple-libs-2.cabal b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/multiple-libs-2.cabal rename to Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.cabal diff --git a/Cabal/tests/ParserTests/regressions/multiple-libs-2.check b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/multiple-libs-2.check rename to Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.check diff --git a/Cabal/tests/ParserTests/regressions/multiple-libs-2.expr b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/multiple-libs-2.expr rename to Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr diff --git a/Cabal/tests/ParserTests/regressions/multiple-libs-2.format b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/multiple-libs-2.format rename to Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.format diff --git a/Cabal/tests/ParserTests/regressions/noVersion.cabal b/Cabal-tests/tests/ParserTests/regressions/noVersion.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/noVersion.cabal rename to Cabal-tests/tests/ParserTests/regressions/noVersion.cabal diff --git a/Cabal/tests/ParserTests/regressions/noVersion.expr b/Cabal-tests/tests/ParserTests/regressions/noVersion.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/noVersion.expr rename to Cabal-tests/tests/ParserTests/regressions/noVersion.expr diff --git a/Cabal/tests/ParserTests/regressions/noVersion.format b/Cabal-tests/tests/ParserTests/regressions/noVersion.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/noVersion.format rename to Cabal-tests/tests/ParserTests/regressions/noVersion.format diff --git a/Cabal/tests/ParserTests/regressions/nothing-unicode.cabal b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/nothing-unicode.cabal rename to Cabal-tests/tests/ParserTests/regressions/nothing-unicode.cabal diff --git a/Cabal/tests/ParserTests/regressions/nothing-unicode.check b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/nothing-unicode.check rename to Cabal-tests/tests/ParserTests/regressions/nothing-unicode.check diff --git a/Cabal/tests/ParserTests/regressions/nothing-unicode.expr b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/nothing-unicode.expr rename to Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr diff --git a/Cabal/tests/ParserTests/regressions/nothing-unicode.format b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/nothing-unicode.format rename to Cabal-tests/tests/ParserTests/regressions/nothing-unicode.format diff --git a/Cabal/tests/ParserTests/regressions/pre-1.6-glob.cabal b/Cabal-tests/tests/ParserTests/regressions/pre-1.6-glob.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/pre-1.6-glob.cabal rename to Cabal-tests/tests/ParserTests/regressions/pre-1.6-glob.cabal diff --git a/Cabal/tests/ParserTests/regressions/pre-1.6-glob.check b/Cabal-tests/tests/ParserTests/regressions/pre-1.6-glob.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/pre-1.6-glob.check rename to Cabal-tests/tests/ParserTests/regressions/pre-1.6-glob.check diff --git a/Cabal/tests/ParserTests/regressions/pre-2.4-globstar.cabal b/Cabal-tests/tests/ParserTests/regressions/pre-2.4-globstar.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/pre-2.4-globstar.cabal rename to Cabal-tests/tests/ParserTests/regressions/pre-2.4-globstar.cabal diff --git a/Cabal/tests/ParserTests/regressions/pre-2.4-globstar.check b/Cabal-tests/tests/ParserTests/regressions/pre-2.4-globstar.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/pre-2.4-globstar.check rename to Cabal-tests/tests/ParserTests/regressions/pre-2.4-globstar.check diff --git a/Cabal/tests/ParserTests/regressions/public-multilib-1.cabal b/Cabal-tests/tests/ParserTests/regressions/public-multilib-1.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/public-multilib-1.cabal rename to Cabal-tests/tests/ParserTests/regressions/public-multilib-1.cabal diff --git a/Cabal/tests/ParserTests/regressions/public-multilib-1.check b/Cabal-tests/tests/ParserTests/regressions/public-multilib-1.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/public-multilib-1.check rename to Cabal-tests/tests/ParserTests/regressions/public-multilib-1.check diff --git a/Cabal/tests/ParserTests/regressions/public-multilib-2.cabal b/Cabal-tests/tests/ParserTests/regressions/public-multilib-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/public-multilib-2.cabal rename to Cabal-tests/tests/ParserTests/regressions/public-multilib-2.cabal diff --git a/Cabal/tests/ParserTests/regressions/public-multilib-2.check b/Cabal-tests/tests/ParserTests/regressions/public-multilib-2.check similarity index 100% rename from Cabal/tests/ParserTests/regressions/public-multilib-2.check rename to Cabal-tests/tests/ParserTests/regressions/public-multilib-2.check diff --git a/Cabal/tests/ParserTests/regressions/shake.cabal b/Cabal-tests/tests/ParserTests/regressions/shake.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/shake.cabal rename to Cabal-tests/tests/ParserTests/regressions/shake.cabal diff --git a/Cabal/tests/ParserTests/regressions/shake.expr b/Cabal-tests/tests/ParserTests/regressions/shake.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/shake.expr rename to Cabal-tests/tests/ParserTests/regressions/shake.expr diff --git a/Cabal/tests/ParserTests/regressions/shake.format b/Cabal-tests/tests/ParserTests/regressions/shake.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/shake.format rename to Cabal-tests/tests/ParserTests/regressions/shake.format diff --git a/Cabal/tests/ParserTests/regressions/spdx-1.cabal b/Cabal-tests/tests/ParserTests/regressions/spdx-1.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-1.cabal rename to Cabal-tests/tests/ParserTests/regressions/spdx-1.cabal diff --git a/Cabal/tests/ParserTests/regressions/spdx-1.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-1.expr rename to Cabal-tests/tests/ParserTests/regressions/spdx-1.expr diff --git a/Cabal/tests/ParserTests/regressions/spdx-1.format b/Cabal-tests/tests/ParserTests/regressions/spdx-1.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-1.format rename to Cabal-tests/tests/ParserTests/regressions/spdx-1.format diff --git a/Cabal/tests/ParserTests/regressions/spdx-2.cabal b/Cabal-tests/tests/ParserTests/regressions/spdx-2.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-2.cabal rename to Cabal-tests/tests/ParserTests/regressions/spdx-2.cabal diff --git a/Cabal/tests/ParserTests/regressions/spdx-2.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-2.expr rename to Cabal-tests/tests/ParserTests/regressions/spdx-2.expr diff --git a/Cabal/tests/ParserTests/regressions/spdx-2.format b/Cabal-tests/tests/ParserTests/regressions/spdx-2.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-2.format rename to Cabal-tests/tests/ParserTests/regressions/spdx-2.format diff --git a/Cabal/tests/ParserTests/regressions/spdx-3.cabal b/Cabal-tests/tests/ParserTests/regressions/spdx-3.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-3.cabal rename to Cabal-tests/tests/ParserTests/regressions/spdx-3.cabal diff --git a/Cabal/tests/ParserTests/regressions/spdx-3.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-3.expr rename to Cabal-tests/tests/ParserTests/regressions/spdx-3.expr diff --git a/Cabal/tests/ParserTests/regressions/spdx-3.format b/Cabal-tests/tests/ParserTests/regressions/spdx-3.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/spdx-3.format rename to Cabal-tests/tests/ParserTests/regressions/spdx-3.format diff --git a/Cabal/tests/ParserTests/regressions/th-lift-instances.cabal b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/th-lift-instances.cabal rename to Cabal-tests/tests/ParserTests/regressions/th-lift-instances.cabal diff --git a/Cabal/tests/ParserTests/regressions/th-lift-instances.expr b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/th-lift-instances.expr rename to Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr diff --git a/Cabal/tests/ParserTests/regressions/th-lift-instances.format b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/th-lift-instances.format rename to Cabal-tests/tests/ParserTests/regressions/th-lift-instances.format diff --git a/Cabal/tests/ParserTests/regressions/version-sets.cabal b/Cabal-tests/tests/ParserTests/regressions/version-sets.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/version-sets.cabal rename to Cabal-tests/tests/ParserTests/regressions/version-sets.cabal diff --git a/Cabal/tests/ParserTests/regressions/version-sets.expr b/Cabal-tests/tests/ParserTests/regressions/version-sets.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/version-sets.expr rename to Cabal-tests/tests/ParserTests/regressions/version-sets.expr diff --git a/Cabal/tests/ParserTests/regressions/version-sets.format b/Cabal-tests/tests/ParserTests/regressions/version-sets.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/version-sets.format rename to Cabal-tests/tests/ParserTests/regressions/version-sets.format diff --git a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.cabal b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.cabal similarity index 100% rename from Cabal/tests/ParserTests/regressions/wl-pprint-indef.cabal rename to Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.cabal diff --git a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.expr b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr similarity index 100% rename from Cabal/tests/ParserTests/regressions/wl-pprint-indef.expr rename to Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr diff --git a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.format b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.format similarity index 100% rename from Cabal/tests/ParserTests/regressions/wl-pprint-indef.format rename to Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.format diff --git a/Cabal/tests/ParserTests/warnings/bom.cabal b/Cabal-tests/tests/ParserTests/warnings/bom.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/bom.cabal rename to Cabal-tests/tests/ParserTests/warnings/bom.cabal diff --git a/Cabal/tests/ParserTests/warnings/bool.cabal b/Cabal-tests/tests/ParserTests/warnings/bool.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/bool.cabal rename to Cabal-tests/tests/ParserTests/warnings/bool.cabal diff --git a/Cabal/tests/ParserTests/warnings/deprecatedfield.cabal b/Cabal-tests/tests/ParserTests/warnings/deprecatedfield.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/deprecatedfield.cabal rename to Cabal-tests/tests/ParserTests/warnings/deprecatedfield.cabal diff --git a/Cabal/tests/ParserTests/warnings/doubledash.cabal b/Cabal-tests/tests/ParserTests/warnings/doubledash.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/doubledash.cabal rename to Cabal-tests/tests/ParserTests/warnings/doubledash.cabal diff --git a/Cabal/tests/ParserTests/warnings/extratestmodule.cabal b/Cabal-tests/tests/ParserTests/warnings/extratestmodule.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/extratestmodule.cabal rename to Cabal-tests/tests/ParserTests/warnings/extratestmodule.cabal diff --git a/Cabal/tests/ParserTests/warnings/gluedop.cabal b/Cabal-tests/tests/ParserTests/warnings/gluedop.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/gluedop.cabal rename to Cabal-tests/tests/ParserTests/warnings/gluedop.cabal diff --git a/Cabal/tests/ParserTests/warnings/multiplesingular.cabal b/Cabal-tests/tests/ParserTests/warnings/multiplesingular.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/multiplesingular.cabal rename to Cabal-tests/tests/ParserTests/warnings/multiplesingular.cabal diff --git a/Cabal/tests/ParserTests/warnings/nbsp.cabal b/Cabal-tests/tests/ParserTests/warnings/nbsp.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/nbsp.cabal rename to Cabal-tests/tests/ParserTests/warnings/nbsp.cabal diff --git a/Cabal/tests/ParserTests/warnings/newsyntax.cabal b/Cabal-tests/tests/ParserTests/warnings/newsyntax.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/newsyntax.cabal rename to Cabal-tests/tests/ParserTests/warnings/newsyntax.cabal diff --git a/Cabal/tests/ParserTests/warnings/oldsyntax.cabal b/Cabal-tests/tests/ParserTests/warnings/oldsyntax.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/oldsyntax.cabal rename to Cabal-tests/tests/ParserTests/warnings/oldsyntax.cabal diff --git a/Cabal/tests/ParserTests/warnings/operator.cabal b/Cabal-tests/tests/ParserTests/warnings/operator.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/operator.cabal rename to Cabal-tests/tests/ParserTests/warnings/operator.cabal diff --git a/Cabal/tests/ParserTests/warnings/specversion-a.cabal b/Cabal-tests/tests/ParserTests/warnings/specversion-a.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/specversion-a.cabal rename to Cabal-tests/tests/ParserTests/warnings/specversion-a.cabal diff --git a/Cabal/tests/ParserTests/warnings/specversion-b.cabal b/Cabal-tests/tests/ParserTests/warnings/specversion-b.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/specversion-b.cabal rename to Cabal-tests/tests/ParserTests/warnings/specversion-b.cabal diff --git a/Cabal/tests/ParserTests/warnings/specversion-c.cabal b/Cabal-tests/tests/ParserTests/warnings/specversion-c.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/specversion-c.cabal rename to Cabal-tests/tests/ParserTests/warnings/specversion-c.cabal diff --git a/Cabal/tests/ParserTests/warnings/subsection.cabal b/Cabal-tests/tests/ParserTests/warnings/subsection.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/subsection.cabal rename to Cabal-tests/tests/ParserTests/warnings/subsection.cabal diff --git a/Cabal/tests/ParserTests/warnings/tab.cabal b/Cabal-tests/tests/ParserTests/warnings/tab.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/tab.cabal rename to Cabal-tests/tests/ParserTests/warnings/tab.cabal diff --git a/Cabal/tests/ParserTests/warnings/trailingfield.cabal b/Cabal-tests/tests/ParserTests/warnings/trailingfield.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/trailingfield.cabal rename to Cabal-tests/tests/ParserTests/warnings/trailingfield.cabal diff --git a/Cabal/tests/ParserTests/warnings/unknownfield.cabal b/Cabal-tests/tests/ParserTests/warnings/unknownfield.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/unknownfield.cabal rename to Cabal-tests/tests/ParserTests/warnings/unknownfield.cabal diff --git a/Cabal/tests/ParserTests/warnings/unknownsection.cabal b/Cabal-tests/tests/ParserTests/warnings/unknownsection.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/unknownsection.cabal rename to Cabal-tests/tests/ParserTests/warnings/unknownsection.cabal diff --git a/Cabal/tests/ParserTests/warnings/utf8.cabal b/Cabal-tests/tests/ParserTests/warnings/utf8.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/utf8.cabal rename to Cabal-tests/tests/ParserTests/warnings/utf8.cabal diff --git a/Cabal/tests/ParserTests/warnings/versiontag.cabal b/Cabal-tests/tests/ParserTests/warnings/versiontag.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/versiontag.cabal rename to Cabal-tests/tests/ParserTests/warnings/versiontag.cabal diff --git a/Cabal/tests/ParserTests/warnings/wildcard.cabal b/Cabal-tests/tests/ParserTests/warnings/wildcard.cabal similarity index 100% rename from Cabal/tests/ParserTests/warnings/wildcard.cabal rename to Cabal-tests/tests/ParserTests/warnings/wildcard.cabal diff --git a/Cabal/tests/README.md b/Cabal-tests/tests/README.md similarity index 100% rename from Cabal/tests/README.md rename to Cabal-tests/tests/README.md diff --git a/Cabal/tests/RPMVerCmp.hs b/Cabal-tests/tests/RPMVerCmp.hs similarity index 100% rename from Cabal/tests/RPMVerCmp.hs rename to Cabal-tests/tests/RPMVerCmp.hs diff --git a/Cabal/tests/Test/Laws.hs b/Cabal-tests/tests/Test/Laws.hs similarity index 100% rename from Cabal/tests/Test/Laws.hs rename to Cabal-tests/tests/Test/Laws.hs diff --git a/Cabal/tests/Test/QuickCheck/Utils.hs b/Cabal-tests/tests/Test/QuickCheck/Utils.hs similarity index 100% rename from Cabal/tests/Test/QuickCheck/Utils.hs rename to Cabal-tests/tests/Test/QuickCheck/Utils.hs diff --git a/Cabal/tests/UnitTests.hs b/Cabal-tests/tests/UnitTests.hs similarity index 100% rename from Cabal/tests/UnitTests.hs rename to Cabal-tests/tests/UnitTests.hs diff --git a/Cabal/tests/UnitTests/Distribution/CabalSpecVersion.hs b/Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/CabalSpecVersion.hs rename to Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs diff --git a/Cabal/tests/UnitTests/Distribution/Compat/CreatePipe.hs b/Cabal-tests/tests/UnitTests/Distribution/Compat/CreatePipe.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Compat/CreatePipe.hs rename to Cabal-tests/tests/UnitTests/Distribution/Compat/CreatePipe.hs diff --git a/Cabal/tests/UnitTests/Distribution/Compat/Graph.hs b/Cabal-tests/tests/UnitTests/Distribution/Compat/Graph.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Compat/Graph.hs rename to Cabal-tests/tests/UnitTests/Distribution/Compat/Graph.hs diff --git a/Cabal/tests/UnitTests/Distribution/Compat/Time.hs b/Cabal-tests/tests/UnitTests/Distribution/Compat/Time.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Compat/Time.hs rename to Cabal-tests/tests/UnitTests/Distribution/Compat/Time.hs diff --git a/Cabal/tests/UnitTests/Distribution/Described.hs b/Cabal-tests/tests/UnitTests/Distribution/Described.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Described.hs rename to Cabal-tests/tests/UnitTests/Distribution/Described.hs diff --git a/Cabal/tests/UnitTests/Distribution/PkgconfigVersion.hs b/Cabal-tests/tests/UnitTests/Distribution/PkgconfigVersion.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/PkgconfigVersion.hs rename to Cabal-tests/tests/UnitTests/Distribution/PkgconfigVersion.hs diff --git a/Cabal/tests/UnitTests/Distribution/SPDX.hs b/Cabal-tests/tests/UnitTests/Distribution/SPDX.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/SPDX.hs rename to Cabal-tests/tests/UnitTests/Distribution/SPDX.hs diff --git a/Cabal/tests/UnitTests/Distribution/Simple/Glob.hs b/Cabal-tests/tests/UnitTests/Distribution/Simple/Glob.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Simple/Glob.hs rename to Cabal-tests/tests/UnitTests/Distribution/Simple/Glob.hs diff --git a/Cabal/tests/UnitTests/Distribution/Simple/Program/GHC.hs b/Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Simple/Program/GHC.hs rename to Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs diff --git a/Cabal/tests/UnitTests/Distribution/Simple/Program/Internal.hs b/Cabal-tests/tests/UnitTests/Distribution/Simple/Program/Internal.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Simple/Program/Internal.hs rename to Cabal-tests/tests/UnitTests/Distribution/Simple/Program/Internal.hs diff --git a/Cabal/tests/UnitTests/Distribution/Simple/Utils.hs b/Cabal-tests/tests/UnitTests/Distribution/Simple/Utils.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Simple/Utils.hs rename to Cabal-tests/tests/UnitTests/Distribution/Simple/Utils.hs diff --git a/Cabal/tests/UnitTests/Distribution/System.hs b/Cabal-tests/tests/UnitTests/Distribution/System.hs similarity index 72% rename from Cabal/tests/UnitTests/Distribution/System.hs rename to Cabal-tests/tests/UnitTests/Distribution/System.hs index 1a117ddb5c2..044d20bd767 100644 --- a/Cabal/tests/UnitTests/Distribution/System.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/System.hs @@ -8,7 +8,9 @@ import Distribution.Parsec import Distribution.Pretty import Distribution.System import Test.Tasty -import Test.Tasty.QuickCheck +import Test.Tasty.QuickCheck (testProperty) +import Test.QuickCheck (Property, (===)) +import Test.QuickCheck.Instances.Cabal () textRoundtrip :: (Show a, Eq a, Pretty a, Parsec a) => a -> Property textRoundtrip x = simpleParsec (prettyShow x) === Just x @@ -19,12 +21,3 @@ tests = , testProperty "Text Arch round trip" (textRoundtrip :: Arch -> Property) , testProperty "Text Platform round trip" (textRoundtrip :: Platform -> Property) ] - -instance Arbitrary OS where - arbitrary = elements knownOSs - -instance Arbitrary Arch where - arbitrary = elements knownArches - -instance Arbitrary Platform where - arbitrary = liftM2 Platform arbitrary arbitrary diff --git a/Cabal/tests/UnitTests/Distribution/Types/GenericPackageDescription.hs b/Cabal-tests/tests/UnitTests/Distribution/Types/GenericPackageDescription.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Types/GenericPackageDescription.hs rename to Cabal-tests/tests/UnitTests/Distribution/Types/GenericPackageDescription.hs diff --git a/Cabal/tests/UnitTests/Distribution/Utils/CharSet.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Utils/CharSet.hs rename to Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs diff --git a/Cabal/tests/UnitTests/Distribution/Utils/Generic.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Generic.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Utils/Generic.hs rename to Cabal-tests/tests/UnitTests/Distribution/Utils/Generic.hs diff --git a/Cabal/tests/UnitTests/Distribution/Utils/NubList.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/NubList.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Utils/NubList.hs rename to Cabal-tests/tests/UnitTests/Distribution/Utils/NubList.hs diff --git a/Cabal/tests/UnitTests/Distribution/Utils/ShortText.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/ShortText.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Utils/ShortText.hs rename to Cabal-tests/tests/UnitTests/Distribution/Utils/ShortText.hs diff --git a/Cabal/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Utils/Structured.hs rename to Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs diff --git a/Cabal/tests/UnitTests/Distribution/Version.hs b/Cabal-tests/tests/UnitTests/Distribution/Version.hs similarity index 100% rename from Cabal/tests/UnitTests/Distribution/Version.hs rename to Cabal-tests/tests/UnitTests/Distribution/Version.hs diff --git a/Cabal/tests/UnitTests/Orphans.hs b/Cabal-tests/tests/UnitTests/Orphans.hs similarity index 100% rename from Cabal/tests/UnitTests/Orphans.hs rename to Cabal-tests/tests/UnitTests/Orphans.hs diff --git a/Cabal/tests/cbits/rpmvercmp.c b/Cabal-tests/tests/cbits/rpmvercmp.c similarity index 100% rename from Cabal/tests/cbits/rpmvercmp.c rename to Cabal-tests/tests/cbits/rpmvercmp.c diff --git a/Cabal/tests/custom-setup/CabalDoctestSetup.hs b/Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs similarity index 100% rename from Cabal/tests/custom-setup/CabalDoctestSetup.hs rename to Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs diff --git a/Cabal/tests/custom-setup/CustomSetupTests.hs b/Cabal-tests/tests/custom-setup/CustomSetupTests.hs similarity index 100% rename from Cabal/tests/custom-setup/CustomSetupTests.hs rename to Cabal-tests/tests/custom-setup/CustomSetupTests.hs diff --git a/Cabal/tests/custom-setup/IdrisSetup.hs b/Cabal-tests/tests/custom-setup/IdrisSetup.hs similarity index 100% rename from Cabal/tests/custom-setup/IdrisSetup.hs rename to Cabal-tests/tests/custom-setup/IdrisSetup.hs diff --git a/Cabal/tests/hackage/check.sh b/Cabal-tests/tests/hackage/check.sh similarity index 100% rename from Cabal/tests/hackage/check.sh rename to Cabal-tests/tests/hackage/check.sh diff --git a/Cabal/tests/hackage/download.sh b/Cabal-tests/tests/hackage/download.sh similarity index 100% rename from Cabal/tests/hackage/download.sh rename to Cabal-tests/tests/hackage/download.sh diff --git a/Cabal/tests/hackage/unpack.sh b/Cabal-tests/tests/hackage/unpack.sh similarity index 100% rename from Cabal/tests/hackage/unpack.sh rename to Cabal-tests/tests/hackage/unpack.sh diff --git a/Cabal/tests/misc/ghc-supported-languages.hs b/Cabal-tests/tests/misc/ghc-supported-languages.hs similarity index 100% rename from Cabal/tests/misc/ghc-supported-languages.hs rename to Cabal-tests/tests/misc/ghc-supported-languages.hs diff --git a/Cabal/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal similarity index 100% rename from Cabal/Cabal-tree-diff/Cabal-tree-diff.cabal rename to Cabal-tree-diff/Cabal-tree-diff.cabal diff --git a/Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs similarity index 100% rename from Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs rename to Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs diff --git a/Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs similarity index 100% rename from Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs rename to Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs diff --git a/Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs similarity index 100% rename from Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs rename to Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs diff --git a/Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs similarity index 100% rename from Cabal/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs rename to Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index da55db6af33..699b143fe7c 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -22,278 +22,7 @@ build-type: Simple -- we can bootstrap. extra-source-files: - README.md tests/README.md ChangeLog.md - - -- Generated with 'make gen-extra-source-files' - -- Do NOT edit this section manually; instead, run the script. - -- BEGIN gen-extra-source-files - tests/ParserTests/errors/MiniAgda.cabal - tests/ParserTests/errors/MiniAgda.errors - tests/ParserTests/errors/anynone.cabal - tests/ParserTests/errors/anynone.errors - tests/ParserTests/errors/big-version.cabal - tests/ParserTests/errors/big-version.errors - tests/ParserTests/errors/common1.cabal - tests/ParserTests/errors/common1.errors - tests/ParserTests/errors/common2.cabal - tests/ParserTests/errors/common2.errors - tests/ParserTests/errors/common3.cabal - tests/ParserTests/errors/common3.errors - tests/ParserTests/errors/forward-compat.cabal - tests/ParserTests/errors/forward-compat.errors - tests/ParserTests/errors/forward-compat2.cabal - tests/ParserTests/errors/forward-compat2.errors - tests/ParserTests/errors/forward-compat3.cabal - tests/ParserTests/errors/forward-compat3.errors - tests/ParserTests/errors/issue-5055-2.cabal - tests/ParserTests/errors/issue-5055-2.errors - tests/ParserTests/errors/issue-5055.cabal - tests/ParserTests/errors/issue-5055.errors - tests/ParserTests/errors/leading-comma-2.cabal - tests/ParserTests/errors/leading-comma-2.errors - tests/ParserTests/errors/leading-comma-2b.cabal - tests/ParserTests/errors/leading-comma-2b.errors - tests/ParserTests/errors/leading-comma-2c.cabal - tests/ParserTests/errors/leading-comma-2c.errors - tests/ParserTests/errors/leading-comma.cabal - tests/ParserTests/errors/leading-comma.errors - tests/ParserTests/errors/libpq1.cabal - tests/ParserTests/errors/libpq1.errors - tests/ParserTests/errors/libpq2.cabal - tests/ParserTests/errors/libpq2.errors - tests/ParserTests/errors/mixin-1.cabal - tests/ParserTests/errors/mixin-1.errors - tests/ParserTests/errors/mixin-2.cabal - tests/ParserTests/errors/mixin-2.errors - tests/ParserTests/errors/multiple-libs.cabal - tests/ParserTests/errors/multiple-libs.errors - tests/ParserTests/errors/noVersion.cabal - tests/ParserTests/errors/noVersion.errors - tests/ParserTests/errors/noVersion2.cabal - tests/ParserTests/errors/noVersion2.errors - tests/ParserTests/errors/range-ge-wild.cabal - tests/ParserTests/errors/range-ge-wild.errors - tests/ParserTests/errors/removed-fields.cabal - tests/ParserTests/errors/removed-fields.errors - tests/ParserTests/errors/spdx-1.cabal - tests/ParserTests/errors/spdx-1.errors - tests/ParserTests/errors/spdx-2.cabal - tests/ParserTests/errors/spdx-2.errors - tests/ParserTests/errors/spdx-3.cabal - tests/ParserTests/errors/spdx-3.errors - tests/ParserTests/errors/undefined-flag.cabal - tests/ParserTests/errors/undefined-flag.errors - tests/ParserTests/errors/version-sets-1.cabal - tests/ParserTests/errors/version-sets-1.errors - tests/ParserTests/errors/version-sets-2.cabal - tests/ParserTests/errors/version-sets-2.errors - tests/ParserTests/errors/version-sets-3.cabal - tests/ParserTests/errors/version-sets-3.errors - tests/ParserTests/errors/version-sets-4.cabal - tests/ParserTests/errors/version-sets-4.errors - tests/ParserTests/ipi/Includes2.cabal - tests/ParserTests/ipi/Includes2.expr - tests/ParserTests/ipi/Includes2.format - tests/ParserTests/ipi/internal-preprocessor-test.cabal - tests/ParserTests/ipi/internal-preprocessor-test.expr - tests/ParserTests/ipi/internal-preprocessor-test.format - tests/ParserTests/ipi/issue-2276-ghc-9885.cabal - tests/ParserTests/ipi/issue-2276-ghc-9885.expr - tests/ParserTests/ipi/issue-2276-ghc-9885.format - tests/ParserTests/ipi/transformers.cabal - tests/ParserTests/ipi/transformers.expr - tests/ParserTests/ipi/transformers.format - tests/ParserTests/regressions/Octree-0.5.cabal - tests/ParserTests/regressions/Octree-0.5.expr - tests/ParserTests/regressions/Octree-0.5.format - tests/ParserTests/regressions/anynone.cabal - tests/ParserTests/regressions/anynone.expr - tests/ParserTests/regressions/anynone.format - tests/ParserTests/regressions/assoc-cpp-options.cabal - tests/ParserTests/regressions/assoc-cpp-options.check - tests/ParserTests/regressions/bad-glob-syntax.cabal - tests/ParserTests/regressions/bad-glob-syntax.check - tests/ParserTests/regressions/big-version.cabal - tests/ParserTests/regressions/big-version.expr - tests/ParserTests/regressions/big-version.format - tests/ParserTests/regressions/cc-options-with-optimization.cabal - tests/ParserTests/regressions/cc-options-with-optimization.check - tests/ParserTests/regressions/common-conditional.cabal - tests/ParserTests/regressions/common-conditional.expr - tests/ParserTests/regressions/common-conditional.format - tests/ParserTests/regressions/common.cabal - tests/ParserTests/regressions/common.expr - tests/ParserTests/regressions/common.format - tests/ParserTests/regressions/common2.cabal - tests/ParserTests/regressions/common2.expr - tests/ParserTests/regressions/common2.format - tests/ParserTests/regressions/common3.cabal - tests/ParserTests/regressions/common3.expr - tests/ParserTests/regressions/common3.format - tests/ParserTests/regressions/cxx-options-with-optimization.cabal - tests/ParserTests/regressions/cxx-options-with-optimization.check - tests/ParserTests/regressions/elif.cabal - tests/ParserTests/regressions/elif.expr - tests/ParserTests/regressions/elif.format - tests/ParserTests/regressions/elif2.cabal - tests/ParserTests/regressions/elif2.expr - tests/ParserTests/regressions/elif2.format - tests/ParserTests/regressions/encoding-0.8.cabal - tests/ParserTests/regressions/encoding-0.8.expr - tests/ParserTests/regressions/encoding-0.8.format - tests/ParserTests/regressions/extensions-paths-5054.cabal - tests/ParserTests/regressions/extensions-paths-5054.check - tests/ParserTests/regressions/generics-sop.cabal - tests/ParserTests/regressions/generics-sop.expr - tests/ParserTests/regressions/generics-sop.format - tests/ParserTests/regressions/ghc-option-j.cabal - tests/ParserTests/regressions/ghc-option-j.check - tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal - tests/ParserTests/regressions/haddock-api-2.18.1-check.check - tests/ParserTests/regressions/hasktorch.cabal - tests/ParserTests/regressions/hasktorch.expr - tests/ParserTests/regressions/hasktorch.format - tests/ParserTests/regressions/hidden-main-lib.cabal - tests/ParserTests/regressions/hidden-main-lib.expr - tests/ParserTests/regressions/hidden-main-lib.format - tests/ParserTests/regressions/indentation.cabal - tests/ParserTests/regressions/indentation.expr - tests/ParserTests/regressions/indentation.format - tests/ParserTests/regressions/indentation2.cabal - tests/ParserTests/regressions/indentation2.expr - tests/ParserTests/regressions/indentation2.format - tests/ParserTests/regressions/indentation3.cabal - tests/ParserTests/regressions/indentation3.expr - tests/ParserTests/regressions/indentation3.format - tests/ParserTests/regressions/issue-5055.cabal - tests/ParserTests/regressions/issue-5055.expr - tests/ParserTests/regressions/issue-5055.format - tests/ParserTests/regressions/issue-5846.cabal - tests/ParserTests/regressions/issue-5846.expr - tests/ParserTests/regressions/issue-5846.format - tests/ParserTests/regressions/issue-6083-a.cabal - tests/ParserTests/regressions/issue-6083-a.expr - tests/ParserTests/regressions/issue-6083-a.format - tests/ParserTests/regressions/issue-6083-b.cabal - tests/ParserTests/regressions/issue-6083-b.expr - tests/ParserTests/regressions/issue-6083-b.format - tests/ParserTests/regressions/issue-6083-c.cabal - tests/ParserTests/regressions/issue-6083-c.expr - tests/ParserTests/regressions/issue-6083-c.format - tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal - tests/ParserTests/regressions/issue-6083-pkg-pkg.expr - tests/ParserTests/regressions/issue-6083-pkg-pkg.format - tests/ParserTests/regressions/issue-6288-a.cabal - tests/ParserTests/regressions/issue-6288-a.check - tests/ParserTests/regressions/issue-6288-b.cabal - tests/ParserTests/regressions/issue-6288-b.check - tests/ParserTests/regressions/issue-6288-c.cabal - tests/ParserTests/regressions/issue-6288-c.check - tests/ParserTests/regressions/issue-6288-d.cabal - tests/ParserTests/regressions/issue-6288-d.check - tests/ParserTests/regressions/issue-6288-e.cabal - tests/ParserTests/regressions/issue-6288-e.check - tests/ParserTests/regressions/issue-6288-f.cabal - tests/ParserTests/regressions/issue-6288-f.check - tests/ParserTests/regressions/issue-774.cabal - tests/ParserTests/regressions/issue-774.check - tests/ParserTests/regressions/issue-774.expr - tests/ParserTests/regressions/issue-774.format - tests/ParserTests/regressions/jaeger-flamegraph.cabal - tests/ParserTests/regressions/jaeger-flamegraph.expr - tests/ParserTests/regressions/jaeger-flamegraph.format - tests/ParserTests/regressions/leading-comma-2.cabal - tests/ParserTests/regressions/leading-comma-2.expr - tests/ParserTests/regressions/leading-comma-2.format - tests/ParserTests/regressions/leading-comma.cabal - tests/ParserTests/regressions/leading-comma.expr - tests/ParserTests/regressions/leading-comma.format - tests/ParserTests/regressions/libpq1.cabal - tests/ParserTests/regressions/libpq1.expr - tests/ParserTests/regressions/libpq1.format - tests/ParserTests/regressions/libpq2.cabal - tests/ParserTests/regressions/libpq2.expr - tests/ParserTests/regressions/libpq2.format - tests/ParserTests/regressions/mixin-1.cabal - tests/ParserTests/regressions/mixin-1.expr - tests/ParserTests/regressions/mixin-1.format - tests/ParserTests/regressions/mixin-2.cabal - tests/ParserTests/regressions/mixin-2.expr - tests/ParserTests/regressions/mixin-2.format - tests/ParserTests/regressions/mixin-3.cabal - tests/ParserTests/regressions/mixin-3.expr - tests/ParserTests/regressions/mixin-3.format - tests/ParserTests/regressions/monad-param.cabal - tests/ParserTests/regressions/monad-param.expr - tests/ParserTests/regressions/monad-param.format - tests/ParserTests/regressions/multiple-libs-2.cabal - tests/ParserTests/regressions/multiple-libs-2.check - tests/ParserTests/regressions/multiple-libs-2.expr - tests/ParserTests/regressions/multiple-libs-2.format - tests/ParserTests/regressions/noVersion.cabal - tests/ParserTests/regressions/noVersion.expr - tests/ParserTests/regressions/noVersion.format - tests/ParserTests/regressions/nothing-unicode.cabal - tests/ParserTests/regressions/nothing-unicode.check - tests/ParserTests/regressions/nothing-unicode.expr - tests/ParserTests/regressions/nothing-unicode.format - tests/ParserTests/regressions/pre-1.6-glob.cabal - tests/ParserTests/regressions/pre-1.6-glob.check - tests/ParserTests/regressions/pre-2.4-globstar.cabal - tests/ParserTests/regressions/pre-2.4-globstar.check - tests/ParserTests/regressions/public-multilib-1.cabal - tests/ParserTests/regressions/public-multilib-1.check - tests/ParserTests/regressions/public-multilib-2.cabal - tests/ParserTests/regressions/public-multilib-2.check - tests/ParserTests/regressions/shake.cabal - tests/ParserTests/regressions/shake.expr - tests/ParserTests/regressions/shake.format - tests/ParserTests/regressions/spdx-1.cabal - tests/ParserTests/regressions/spdx-1.expr - tests/ParserTests/regressions/spdx-1.format - tests/ParserTests/regressions/spdx-2.cabal - tests/ParserTests/regressions/spdx-2.expr - tests/ParserTests/regressions/spdx-2.format - tests/ParserTests/regressions/spdx-3.cabal - tests/ParserTests/regressions/spdx-3.expr - tests/ParserTests/regressions/spdx-3.format - tests/ParserTests/regressions/th-lift-instances.cabal - tests/ParserTests/regressions/th-lift-instances.expr - tests/ParserTests/regressions/th-lift-instances.format - tests/ParserTests/regressions/version-sets.cabal - tests/ParserTests/regressions/version-sets.expr - tests/ParserTests/regressions/version-sets.format - tests/ParserTests/regressions/wl-pprint-indef.cabal - tests/ParserTests/regressions/wl-pprint-indef.expr - tests/ParserTests/regressions/wl-pprint-indef.format - tests/ParserTests/warnings/bom.cabal - tests/ParserTests/warnings/bool.cabal - tests/ParserTests/warnings/deprecatedfield.cabal - tests/ParserTests/warnings/doubledash.cabal - tests/ParserTests/warnings/extratestmodule.cabal - tests/ParserTests/warnings/gluedop.cabal - tests/ParserTests/warnings/multiplesingular.cabal - tests/ParserTests/warnings/nbsp.cabal - tests/ParserTests/warnings/newsyntax.cabal - tests/ParserTests/warnings/oldsyntax.cabal - tests/ParserTests/warnings/operator.cabal - tests/ParserTests/warnings/specversion-a.cabal - tests/ParserTests/warnings/specversion-b.cabal - tests/ParserTests/warnings/specversion-c.cabal - tests/ParserTests/warnings/subsection.cabal - tests/ParserTests/warnings/tab.cabal - tests/ParserTests/warnings/trailingfield.cabal - tests/ParserTests/warnings/unknownfield.cabal - tests/ParserTests/warnings/unknownsection.cabal - tests/ParserTests/warnings/utf8.cabal - tests/ParserTests/warnings/versiontag.cabal - tests/ParserTests/warnings/wildcard.cabal - tests/cbits/rpmvercmp.c - tests/hackage/check.sh - tests/hackage/download.sh - tests/hackage/unpack.sh - tests/misc/ghc-supported-languages.hs - -- END gen-extra-source-files + README.md ChangeLog.md source-repository head type: git @@ -646,223 +375,3 @@ library if impl(ghc >= 7.11) other-extensions: PatternSynonyms - --- Small, fast running tests. -test-suite unit-tests - type: exitcode-stdio-1.0 - hs-source-dirs: tests - other-modules: - Test.Laws - Test.QuickCheck.Utils - UnitTests.Distribution.CabalSpecVersion - UnitTests.Distribution.Compat.CreatePipe - UnitTests.Distribution.Compat.Graph - UnitTests.Distribution.Compat.Time - UnitTests.Distribution.Described - UnitTests.Distribution.Simple.Glob - UnitTests.Distribution.Simple.Program.GHC - UnitTests.Distribution.Simple.Program.Internal - UnitTests.Distribution.Simple.Utils - UnitTests.Distribution.SPDX - UnitTests.Distribution.System - UnitTests.Distribution.Types.GenericPackageDescription - UnitTests.Distribution.Utils.CharSet - UnitTests.Distribution.Utils.Generic - UnitTests.Distribution.Utils.NubList - UnitTests.Distribution.Utils.ShortText - UnitTests.Distribution.Utils.Structured - UnitTests.Distribution.Version - UnitTests.Distribution.PkgconfigVersion - UnitTests.Orphans - - -- Cabal-quickcheck - hs-source-dirs: Cabal-QuickCheck/src - other-modules: - Test.QuickCheck.GenericArbitrary - Test.QuickCheck.Instances.Cabal - - -- Cabal-described - hs-source-dirs: Cabal-described/src - other-modules: - Distribution.Described - Distribution.Utils.CharSet - Distribution.Utils.GrammarRegex - - main-is: UnitTests.hs - build-depends: - array, - async >= 2.2.2 && <2.3, - base, - binary, - bytestring, - containers, - deepseq, - directory, - filepath, - integer-logarithms >= 1.0.2 && <1.1, - pretty, - rere >=0.1 && <0.2, - tagged, - tasty >= 1.2.3 && < 1.4, - tasty-hunit, - tasty-quickcheck, - temporary, - text, - transformers, - Diff >=0.4 && <0.5, - QuickCheck >= 2.14 && < 2.15, - Cabal - ghc-options: -Wall - default-language: Haskell2010 - - if !impl(ghc >= 7.10) - build-depends: void - - if !impl(ghc >= 8.0) - build-depends: semigroups - -test-suite parser-tests - type: exitcode-stdio-1.0 - hs-source-dirs: tests - main-is: ParserTests.hs - build-depends: - base, - base-compat >=0.11.0 && <0.12, - bytestring, - directory, - filepath, - tasty >= 1.2.3 && < 1.4, - tasty-hunit, - tasty-quickcheck, - tasty-golden >=2.3.1.1 && <2.4, - Diff >=0.4 && <0.5, - Cabal - ghc-options: -Wall - default-language: Haskell2010 - - if !impl(ghc >= 8.0) - build-depends: semigroups - - if impl(ghc >= 7.8) - build-depends: - tree-diff >= 0.1 && <0.2 - hs-source-dirs: Cabal-tree-diff/src - other-modules: - Data.TreeDiff.Instances.Cabal - Data.TreeDiff.Instances.CabalLanguage - Data.TreeDiff.Instances.CabalSPDX - Data.TreeDiff.Instances.CabalVersion - -test-suite check-tests - type: exitcode-stdio-1.0 - hs-source-dirs: tests - main-is: CheckTests.hs - build-depends: - base, - bytestring, - directory, - filepath, - tasty >= 1.2.3 && < 1.4, - tasty-golden >=2.3.1.1 && <2.4, - Diff >=0.4 && <0.5, - Cabal - ghc-options: -Wall - default-language: Haskell2010 - if !impl(ghc >= 8.0) - build-depends: semigroups - -test-suite custom-setup-tests - type: exitcode-stdio-1.0 - hs-source-dirs: tests/custom-setup - main-is: CustomSetupTests.hs - other-modules: - CabalDoctestSetup - IdrisSetup - build-depends: - Cabal, - base, - directory, - filepath, - process - default-language: Haskell2010 - -test-suite hackage-tests - type: exitcode-stdio-1.0 - main-is: HackageTests.hs - - -- TODO: need to get 01-index.tar on appveyor - if os(windows) - buildable: False - - hs-source-dirs: tests - - build-depends: - base, - Cabal, - bytestring, - deepseq, - containers, - directory, - filepath - - build-depends: - base-compat >=0.11.0 && <0.12, - base-orphans >=0.6 && <0.9, - clock >=0.8 && <0.9, - optparse-applicative >=0.13.2.0 && <0.17, - stm >=2.4.5.0 && <2.6, - tar >=0.5.0.3 && <0.6 - - if impl(ghc >= 7.8) - build-depends: - tree-diff >= 0.1 && <0.2 - hs-source-dirs: Cabal-tree-diff/src - other-modules: - Data.TreeDiff.Instances.Cabal - Data.TreeDiff.Instances.CabalLanguage - Data.TreeDiff.Instances.CabalSPDX - Data.TreeDiff.Instances.CabalVersion - - ghc-options: -Wall -rtsopts -threaded - default-extensions: CPP - default-language: Haskell2010 - -test-suite rpmvercmp - type: exitcode-stdio-1.0 - main-is: RPMVerCmp.hs - - hs-source-dirs: tests - build-depends: - base, - Cabal, - bytestring - - build-depends: - tasty >= 1.2.3 && < 1.4, - tasty-hunit, - tasty-quickcheck, - QuickCheck - - c-sources: tests/cbits/rpmvercmp.c - cc-options: -Wall - - ghc-options: -Wall - default-language: Haskell2010 - -test-suite no-thunks-test - default-language: Haskell2010 - ghc-options: -Wall - type: exitcode-stdio-1.0 - main-is: NoThunks.hs - - if !impl(ghc >= 8.6) - buildable: False - - hs-source-dirs: tests - build-depends: - base, - Cabal, - tasty >= 1.2.3 && < 1.4, - bytestring, - tasty-hunit, - nothunks diff --git a/Makefile b/Makefile index 36e73482d95..a32a8cda248 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ .PHONY : all lexer sdpx lib exe doctest -.PHONY : gen-extra-source-files gen-extra-source-files-lib gen-extra-source-files-cli .PHONY : cabal-install-dev cabal-install-prod .PHONY : phony @@ -86,13 +85,6 @@ cabal-install-dev : cabal-install/cabal-install.cabal.dev @echo "tell git to ignore changes to cabal-install.cabal:" @echo "git update-index --assume-unchanged cabal-install/cabal-install.cabal" -# extra-source-files generation - -gen-extra-source-files : gen-extra-source-files-lib - -gen-extra-source-files-lib : - cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-extra-source-files -- $$(pwd)/Cabal/Cabal.cabal - # analyse-imports analyse-imports : phony find Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports -- @@ -228,7 +220,7 @@ weeder : # tags .PHONY : tags tags : - hasktags -b Cabal/src Cabal/Cabal-described/src cabal-install/src cabal-testsuite/src + hasktags -b Cabal/src Cabal-described/src cabal-install/src cabal-testsuite/src # boostrapping ############################################################################## diff --git a/appveyor.yml b/appveyor.yml index a29e69f234d..86b93d5e423 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,11 +51,11 @@ build_script: - cabal %CABOPTS% v2-configure --enable-tests - appveyor-retry cabal %CABOPTS% v2-build lib:Cabal --only-dependencies - cabal %CABOPTS% v2-build lib:Cabal - - appveyor-retry cabal %CABOPTS% v2-build Cabal:tests --only-dependencies - - cabal %CABOPTS% v2-test Cabal + - appveyor-retry cabal %CABOPTS% v2-build Cabal-tests:tests --only-dependencies + - cabal %CABOPTS% v2-test Cabal-tests - appveyor-retry cabal %CABOPTS% v2-build exe:cabal exe:cabal-tests --only-dependencies - cabal %CABOPTS% v2-build exe:cabal - - cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe + - cabal %CABOPTS% v2-run cabal-testsuite:cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe - appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies - cd cabal-install - cabal %CABOPTS% v2-run cabal-install:memory-usage-tests diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index 9a8a716aa30..dc9e08f0506 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/cabal-dev-scripts/cabal-dev-scripts.cabal @@ -10,18 +10,6 @@ author: Cabal Development Team category: Distribution build-type: Simple -executable gen-extra-source-files - default-language: Haskell2010 - main-is: GenExtraSourceFiles.hs - hs-source-dirs: src - build-depends: - , base >=4.10 && <4.15 - , bytestring - , Cabal >=2.2 && <3.3 - , directory - , filepath - , process - executable gen-spdx default-language: Haskell2010 main-is: GenSPDX.hs diff --git a/cabal-dev-scripts/src/GenExtraSourceFiles.hs b/cabal-dev-scripts/src/GenExtraSourceFiles.hs deleted file mode 100644 index 30664977684..00000000000 --- a/cabal-dev-scripts/src/GenExtraSourceFiles.hs +++ /dev/null @@ -1,121 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} - -import qualified Distribution.ModuleName as ModuleName -import Distribution.PackageDescription -import Distribution.PackageDescription.Parsec - (parseGenericPackageDescription, runParseResult) -import Distribution.Verbosity (silent) - -import Control.Monad (liftM, filterM) -import Data.List (isPrefixOf, isSuffixOf, sort) -import System.Directory (canonicalizePath, doesFileExist, setCurrentDirectory) -import System.Environment (getArgs, getProgName) -import System.FilePath ((), takeDirectory, takeExtension, takeFileName) -import System.Process (readProcess) - - -import qualified Data.ByteString as BS -import qualified Data.ByteString.Char8 as BS8 -import qualified System.IO as IO - -main' :: FilePath -> FilePath -> IO () -main' templateFp fp' = do - fp <- canonicalizePath fp' - setCurrentDirectory (takeDirectory fp) - print $ takeDirectory fp - - -- Read cabal file, so we can determine test modules - contents <- BS.readFile fp - cabal <- - case snd . runParseResult . parseGenericPackageDescription $ contents of - Right x -> pure x - Left (_mver, errs) -> fail (show errs) - - -- We skip some files - testModuleFiles <- getOtherModulesFiles cabal - let skipPredicates' = skipPredicates ++ map (==) testModuleFiles - print testModuleFiles - - -- Read all files git knows about under "tests" - files0 <- lines <$> readProcess "git" ["ls-files", "tests"] "" - - -- Filter - let files1 = filter (\f -> takeExtension f `elem` whitelistedExtensionss || - takeFileName f `elem` whitelistedFiles) - files0 - let files2 = filter (\f -> not $ any ($ f) skipPredicates') files1 - let files3 = sort files2 - let files = files3 - - -- Read current file - templateContents <- BS.readFile templateFp - let topLine' = BS8.pack topLine - bottomLine' = BS8.pack bottomLine - inputLines = BS8.lines templateContents - linesBefore = takeWhile (/= topLine') inputLines - linesAfter = dropWhile (/= bottomLine') inputLines - - -- Output - let outputLines = linesBefore ++ [topLine'] - ++ map ((<>) " " . BS8.pack) files ++ linesAfter - BS.writeFile templateFp (BS8.unlines outputLines) - - -topLine, bottomLine :: String -topLine = " -- BEGIN gen-extra-source-files" -bottomLine = " -- END gen-extra-source-files" - -whitelistedFiles :: [FilePath] -whitelistedFiles = [ "ghc", "ghc-pkg", "ghc-7.10" - , "ghc-pkg-7.10", "ghc-pkg-ghc-7.10" ] - -whitelistedExtensionss :: [String] -whitelistedExtensionss = map ('.' : ) - [ "hs", "lhs", "c", "h", "sh", "cabal", "hsc" - , "err", "out", "in", "project", "format", "errors", "expr" - , "check" - ] - -getOtherModulesFiles :: GenericPackageDescription -> IO [FilePath] -getOtherModulesFiles gpd = do - mainModules <- liftM concat . mapM findMainModules $ testSuites - otherModules' <- liftM concat . mapM findOtherModules $ testSuites - - return $ mainModules ++ otherModules' - where - testSuites :: [TestSuite] - testSuites = map (foldMap id . snd) (condTestSuites gpd) - - findMainModules, findOtherModules :: TestSuite -> IO [FilePath] - findMainModules ts = findModules (mainModule . testInterface $ ts) ts - findOtherModules ts = - findModules (map fromModuleName . otherModules . testBuildInfo $ ts) ts - - findModules :: [FilePath] -> TestSuite -> IO [FilePath] - findModules filenames ts = filterM doesFileExist - [ d f | d <- locations, f <- filenames ] - where locations = hsSourceDirs . testBuildInfo $ ts - - fromModuleName mn = ModuleName.toFilePath mn ++ ".hs" - - mainModule (TestSuiteLibV09 _ mn) = [fromModuleName mn] - mainModule (TestSuiteExeV10 _ fp) = [fp] - mainModule _ = [] - -skipPredicates :: [FilePath -> Bool] -skipPredicates = - [ isSuffixOf "register.sh" - ] - -main :: IO () -main = do - args <- getArgs - case args of - [fp] -> main' fp fp - [fp,fp'] -> main' fp fp' - _ -> do - progName <- getProgName - putStrLn "Error too few arguments!" - putStrLn $ "Usage: " ++ progName ++ " " - putStrLn $ " where FILE is Cabal.cabal, cabal-testsuite.cabal, " - ++ "or cabal-install.cabal" diff --git a/cabal.project b/cabal.project index 405a7ea21eb..8c999d080ea 100644 --- a/cabal.project +++ b/cabal.project @@ -4,9 +4,10 @@ packages: cabal-install/ packages: solver-benchmarks/ tests: True -packages: Cabal/Cabal-QuickCheck/ -packages: Cabal/Cabal-tree-diff/ -packages: Cabal/Cabal-described +packages: Cabal-QuickCheck/ +packages: Cabal-tree-diff/ +packages: Cabal-described +packages: Cabal-tests/ packages: cabal-benchmarks/ -- Uncomment to allow picking up extra local unpacked deps: diff --git a/cabal.project.buildinfo b/cabal.project.buildinfo index defeb65b594..c0cd46b1e37 100644 --- a/cabal.project.buildinfo +++ b/cabal.project.buildinfo @@ -1,5 +1,5 @@ packages: Cabal/ -packages: Cabal/Cabal-described +packages: Cabal-described packages: buildinfo-reference-generator/ tests: False optimization: False diff --git a/cabal.project.validate b/cabal.project.validate index 7d6c8ac3360..a82d4744e68 100644 --- a/cabal.project.validate +++ b/cabal.project.validate @@ -4,9 +4,11 @@ packages: cabal-install/ packages: solver-benchmarks/ packages: cabal-install/cabal-install-solver/ -packages: Cabal/Cabal-QuickCheck/ -packages: Cabal/Cabal-tree-diff -packages: Cabal/Cabal-described +packages: Cabal-QuickCheck/ +packages: Cabal-tree-diff +packages: Cabal-described +packages: Cabal-tests +packages: cabal-benchmarks tests: True diff --git a/cabal.project.validate.libonly b/cabal.project.validate.libonly index ac00865713e..505123f3b4c 100644 --- a/cabal.project.validate.libonly +++ b/cabal.project.validate.libonly @@ -1,5 +1,9 @@ packages: Cabal/ packages: cabal-testsuite/ +packages: Cabal-QuickCheck/ +packages: Cabal-tree-diff +packages: Cabal-described +packages: Cabal-tests tests: True diff --git a/templates/ci-quick-jobs.template.yml b/templates/ci-quick-jobs.template.yml index 0cc086ad402..d151237cc54 100644 --- a/templates/ci-quick-jobs.template.yml +++ b/templates/ci-quick-jobs.template.yml @@ -39,7 +39,6 @@ jobs: - name: Regenerate files run: | make lexer - make gen-extra-source-files make spdx make templates make github-actions diff --git a/templates/ci-windows.template.yml b/templates/ci-windows.template.yml index 531d66a9929..ebc3ad84ea4 100644 --- a/templates/ci-windows.template.yml +++ b/templates/ci-windows.template.yml @@ -61,6 +61,9 @@ jobs: run: cabal v2-build Cabal --only-dependencies - name: cabal v2-build run: cabal v2-build all + - name: Cabal unit-tests + run: | + cabal v2-test Cabal-tests - name: cabal-install memory-usage-tests run: | cd cabal-install @@ -79,5 +82,5 @@ jobs: cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)" - name: cabal-tests # Using only one job, -j1, to fail less. - run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe + run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe {% endfor %} diff --git a/validate.sh b/validate.sh index 43d684cfb5b..bdaf8d479a8 100755 --- a/validate.sh +++ b/validate.sh @@ -272,8 +272,8 @@ if [ -z "$STEPS" ]; then STEPS="$STEPS time-summary" fi -TARGETS="Cabal cabal-testsuite" -if ! $LIBONLY; then TARGETS="$TARGETS cabal-install cabal-install-solver Cabal-QuickCheck Cabal-tree-diff Cabal-described"; fi +TARGETS="Cabal cabal-testsuite Cabal-tests Cabal-QuickCheck Cabal-tree-diff Cabal-described" +if ! $LIBONLY; then TARGETS="$TARGETS cabal-install cabal-install-solver cabal-benchmarks"; fi if $BENCHMARKS; then TARGETS="$TARGETS solver-benchmarks"; fi if $LISTSTEPS; then @@ -383,24 +383,30 @@ timed doctest -package-env=doctest-Cabal --fast Cabal/Distribution Cabal/Languag step_lib_tests() { print_header "Cabal: tests" -CMD="$($CABALPLANLISTBIN Cabal:test:unit-tests) $TESTSUITEJOBS --hide-successes --with-ghc=$HC" -(cd Cabal && timed $CMD) || exit 1 +CMD="$($CABALPLANLISTBIN Cabal-tests:test:unit-tests) $TESTSUITEJOBS --hide-successes --with-ghc=$HC" +(cd Cabal-tests && timed $CMD) || exit 1 -CMD="$($CABALPLANLISTBIN Cabal:test:check-tests) $TESTSUITEJOBS --hide-successes" -(cd Cabal && timed $CMD) || exit 1 +CMD="$($CABALPLANLISTBIN Cabal-tests:test:check-tests) $TESTSUITEJOBS --hide-successes" +(cd Cabal-tests && timed $CMD) || exit 1 -CMD="$($CABALPLANLISTBIN Cabal:test:parser-tests) $TESTSUITEJOBS --hide-successes" -(cd Cabal && timed $CMD) || exit 1 +CMD="$($CABALPLANLISTBIN Cabal-tests:test:parser-tests) $TESTSUITEJOBS --hide-successes" +(cd Cabal-tests && timed $CMD) || exit 1 + +CMD="$($CABALPLANLISTBIN Cabal-tests:test:rpmvercmp) $TESTSUITEJOBS --hide-successes" +(cd Cabal-tests && timed $CMD) || exit 1 + +CMD="$($CABALPLANLISTBIN Cabal-tests:test:no-thunks-test) $TESTSUITEJOBS --hide-successes" +(cd Cabal-tests && timed $CMD) || exit 1 -CMD=$($CABALPLANLISTBIN Cabal:test:hackage-tests) -(cd Cabal && timed $CMD read-fields) || exit 1 +CMD=$($CABALPLANLISTBIN Cabal-tests:test:hackage-tests) +(cd Cabal-tests && timed $CMD read-fields) || exit 1 if $HACKAGETESTSALL; then - (cd Cabal && timed $CMD parsec) || exit 1 - (cd Cabal && timed $CMD roundtrip) || exit 1 + (cd Cabal-tests && timed $CMD parsec) || exit 1 + (cd Cabal-tests && timed $CMD roundtrip) || exit 1 else - (cd Cabal && timed $CMD parsec d) || exit 1 - (cd Cabal && timed $CMD roundtrip k) || exit 1 + (cd Cabal-tests && timed $CMD parsec d) || exit 1 + (cd Cabal-tests && timed $CMD roundtrip k) || exit 1 fi }