Get HPC working for cabal-install

* Strips away dogfooding framework and zinza templates
* Splits out tests into targets by as a function of running time
* Delete TESTING.md as it no longer applies
* Bump cabal-install.cabal to its dev template settings (base >= 4.10,
Cabal 2.2)
* Remove Paths_cabal_install (blocks HPC generation)
* Add `long-tests` target to split out unit-tests and long-running
  DVCS tests.

Author: emilypi

cabal-install/TESTING.md

@@ -1,8 +1,5 @@
-Cabal-Version:      >= 1.10
--- NOTE: This file is autogenerated from 'cabal-install.cabal.pp'.
--- DO NOT EDIT MANUALLY.
--- To update this file, edit 'cabal-install.cabal.pp' and run
--- 'make cabal-install-prod' in the project's root folder.
+Cabal-Version:      2.2
+
 Name:               cabal-install
 Version:            3.5.0.0
 Synopsis:           The command-line interface for Cabal and Hackage.
@@ -12,68 +9,57 @@ Description:
     and installation of Haskell libraries and programs.
 homepage:           http://www.haskell.org/cabal/
 bug-reports:        https://github.com/haskell/cabal/issues
-License:            BSD3
+License:            BSD-3-Clause
 License-File:       LICENSE
 Author:             Cabal Development Team (see AUTHORS file)
 Maintainer:         Cabal Development Team <[email protected]>
 Copyright:          2003-2020, Cabal Development Team
 Category:           Distribution
 Build-type:         Simple
 Extra-Source-Files:
-  README.md bash-completion/cabal changelog
+  README.md
+  bash-completion/cabal
+  changelog
 
 source-repository head
   type:     git
   location: https://github.com/haskell/cabal/
   subdir:   cabal-install
 
 Flag native-dns
-  description:  Enable use of the [resolv](https://hackage.haskell.org/package/resolv) & [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups
+  description:
+    Enable use of the [resolv](https://hackage.haskell.org/package/resolv)
+    & [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups
   default:      True
   manual:       True
 
-Flag debug-expensive-assertions
-  description:  Enable expensive assertions for testing or debugging
-  default:      False
-  manual:       True
-
-Flag debug-conflict-sets
-  description:  Add additional information to ConflictSets
-  default:      False
-  manual:       True
-
-Flag debug-tracetree
-  description:  Compile in support for tracetree (used to debug the solver)
-  default:      False
-  manual:       True
-
 Flag lukko
   description:  Use @lukko@ for file-locking
   default:      True
   manual:       True
 
-executable cabal
-    main-is:        Main.hs
-    hs-source-dirs: main
-    default-language: Haskell2010
-    ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates
-    if impl(ghc >= 8.0)
-        ghc-options: -Wcompat
-                     -Wnoncanonical-monad-instances
-      if impl(ghc < 8.8)
-        ghc-options: -Wnoncanonical-monadfail-instances
+common warnings
+    ghc-options: -Wall -Wcompat -Wnoncanonical-monad-instances
+    if impl(ghc < 8.8)
+      ghc-options: -Wnoncanonical-monadfail-instances
+    if impl(ghc >=8.10)
+      ghc-options: -Wunused-packages
 
-      if impl(ghc >=8.10)
-        ghc-options: -Wunused-packages
+common base-dep
+    build-depends: base >=4.10 && <4.16
 
+common cabal-dep
+    build-depends: Cabal ^>=3.5
 
-    ghc-options: -rtsopts -threaded
+common cabal-install-solver-dep
+    build-depends: cabal-install-solver ^>=3.5
 
-    -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
-    if os(aix)
-        extra-libraries: bsd
-    hs-source-dirs: src
-    other-modules:
+library
+    import: warnings, base-dep, cabal-dep, cabal-install-solver-dep
+    default-language: Haskell2010
+
+    hs-source-dirs:   src
+    exposed-modules:
         -- this modules are moved from Cabal
         -- they are needed for as long until cabal-install moves to parsec parser
         Distribution.Deprecated.ParseUtils
@@ -205,72 +191,12 @@ executable cabal
         Distribution.Client.Win32SelfUpgrade
         Distribution.Client.World
 
-    hs-source-dirs: cabal-install-solver/src-assertion
-    other-modules:
-        Distribution.Client.Utils.Assertion
-
-    hs-source-dirs: cabal-install-solver/src
-    other-modules:
-        Distribution.Solver.Compat.Prelude
-        Distribution.Solver.Modular
-        Distribution.Solver.Modular.Assignment
-        Distribution.Solver.Modular.Builder
-        Distribution.Solver.Modular.Configured
-        Distribution.Solver.Modular.ConfiguredConversion
-        Distribution.Solver.Modular.ConflictSet
-        Distribution.Solver.Modular.Cycles
-        Distribution.Solver.Modular.Dependency
-        Distribution.Solver.Modular.Explore
-        Distribution.Solver.Modular.Flag
-        Distribution.Solver.Modular.Index
-        Distribution.Solver.Modular.IndexConversion
-        Distribution.Solver.Modular.LabeledGraph
-        Distribution.Solver.Modular.Linking
-        Distribution.Solver.Modular.Log
-        Distribution.Solver.Modular.Message
-        Distribution.Solver.Modular.PSQ
-        Distribution.Solver.Modular.Package
-        Distribution.Solver.Modular.Preference
-        Distribution.Solver.Modular.RetryLog
-        Distribution.Solver.Modular.Solver
-        Distribution.Solver.Modular.Tree
-        Distribution.Solver.Modular.Validate
-        Distribution.Solver.Modular.Var
-        Distribution.Solver.Modular.Version
-        Distribution.Solver.Modular.WeightedPSQ
-        Distribution.Solver.Types.ComponentDeps
-        Distribution.Solver.Types.ConstraintSource
-        Distribution.Solver.Types.DependencyResolver
-        Distribution.Solver.Types.Flag
-        Distribution.Solver.Types.InstSolverPackage
-        Distribution.Solver.Types.InstalledPreference
-        Distribution.Solver.Types.LabeledPackageConstraint
-        Distribution.Solver.Types.OptionalStanza
-        Distribution.Solver.Types.PackageConstraint
-        Distribution.Solver.Types.PackageFixedDeps
-        Distribution.Solver.Types.PackageIndex
-        Distribution.Solver.Types.PackagePath
-        Distribution.Solver.Types.PackagePreferences
-        Distribution.Solver.Types.PkgConfigDb
-        Distribution.Solver.Types.Progress
-        Distribution.Solver.Types.ResolverPackage
-        Distribution.Solver.Types.Settings
-        Distribution.Solver.Types.SolverId
-        Distribution.Solver.Types.SolverPackage
-        Distribution.Solver.Types.SourcePackage
-        Distribution.Solver.Types.Variable
-
-    other-modules:
-        Paths_cabal_install
-
     build-depends:
         async      >= 2.0      && < 2.3,
         array      >= 0.4      && < 0.6,
-        base       >= 4.8      && < 4.15,
         base16-bytestring >= 0.1.1 && < 1.1.0.0,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.12,
-        Cabal      == 3.5.*,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,
         deepseq    >= 1.4.1.1  && < 1.5,
@@ -296,10 +222,6 @@ executable cabal
         regex-base  >= 0.94.0.0 && <0.95,
         regex-posix >= 0.96.0.0 && <0.97
 
-    if !impl(ghc >= 8.0)
-        build-depends: fail        == 4.9.*
-        build-depends: semigroups  >= 0.18.3 && <0.20
-
     if flag(native-dns)
       if os(windows)
         build-depends: windns      >= 0.1.0 && < 0.2
@@ -314,16 +236,163 @@ executable cabal
 
     if flag(lukko)
       build-depends: lukko >= 0.1 && <0.2
-    else
-      build-depends: base >= 4.10
 
-    if flag(debug-expensive-assertions)
-      cpp-options: -DDEBUG_EXPENSIVE_ASSERTIONS
 
-    if flag(debug-conflict-sets)
-      cpp-options: -DDEBUG_CONFLICT_SETS
-      build-depends: base >= 4.8
+executable cabal
+    import: warnings, base-dep, cabal-dep, cabal-install-solver-dep
+    main-is: Main.hs
+    hs-source-dirs: main
+    default-language: Haskell2010
+
+    ghc-options: -rtsopts -threaded
+
+    -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
+    if os(aix)
+        extra-libraries: bsd
+
+    build-depends:
+        cabal-install,
+        directory,
+        filepath
+
+-- Small, fast running tests.
+--
+Test-Suite unit-tests
+    import: warnings, base-dep, cabal-dep, cabal-install-solver-dep
+    default-language: Haskell2010
+    ghc-options: -rtsopts -threaded
+
+    type: exitcode-stdio-1.0
+    main-is: UnitTests.hs
+    hs-source-dirs: tests
+    other-modules:
+      UnitTests.Distribution.Client.ArbitraryInstances
+      UnitTests.Distribution.Client.BuildReport
+      UnitTests.Distribution.Client.Targets
+      UnitTests.Distribution.Client.Get
+      UnitTests.Distribution.Client.Glob
+      UnitTests.Distribution.Client.GZipUtils
+      UnitTests.Distribution.Client.Init
+      UnitTests.Distribution.Client.Store
+      UnitTests.Distribution.Client.Tar
+      UnitTests.Distribution.Client.TreeDiffInstances
+      UnitTests.Distribution.Client.UserConfig
+      UnitTests.Distribution.Client.ProjectConfig
+      UnitTests.Distribution.Client.JobControl
+      UnitTests.Distribution.Client.IndexUtils.Timestamp
+      UnitTests.Distribution.Client.InstallPlan
+      UnitTests.Distribution.Solver.Modular.Builder
+      UnitTests.Distribution.Solver.Modular.RetryLog
+      UnitTests.Distribution.Solver.Modular.Solver
+      UnitTests.Distribution.Solver.Modular.DSL
+      UnitTests.Distribution.Solver.Modular.DSL.TestCaseUtils
+      UnitTests.Distribution.Solver.Modular.WeightedPSQ
+      UnitTests.Distribution.Solver.Types.OptionalStanza
+      UnitTests.Options
+      UnitTests.TempTestDir
+
+    build-depends:
+          array,
+          bytestring,
+          cabal-install,
+          Cabal-tree-diff,
+          Cabal-QuickCheck,
+          containers,
+          directory,
+          filepath,
+          mtl,
+          network-uri >= 2.6.2.0 && <2.6.4.0,
+          random,
+          tar,
+          time,
+          zlib,
+          tasty >= 1.2.3 && <1.4,
+          tasty-golden >=2.3.1.1 && <2.4,
+          tasty-quickcheck,
+          tasty-hunit >= 0.10,
+          tree-diff,
+          QuickCheck >= 2.14 && <2.15
+
+
+-- Tests to run with a limited stack and heap size
+--
+Test-Suite memory-usage-tests
+  import: warnings, base-dep, cabal-dep, cabal-install-solver-dep
+  type: exitcode-stdio-1.0
+  main-is: MemoryUsageTests.hs
+  hs-source-dirs: tests
+  default-language: Haskell2010
+
+  ghc-options: -threaded "-with-rtsopts=-M4M -K1K"
+
+  other-modules:
+    UnitTests.Distribution.Solver.Modular.DSL
+    UnitTests.Distribution.Solver.Modular.DSL.TestCaseUtils
+    UnitTests.Distribution.Solver.Modular.MemoryUsage
+    UnitTests.Options
+
+  build-depends:
+        cabal-install,
+        containers,
+        tasty >= 1.2.3 && <1.4,
+        tasty-hunit >= 0.10
+
+
+-- Integration tests that use the cabal-install code directly
+-- but still build whole projects
+test-suite integration-tests2
+  import: warnings, base-dep, cabal-dep, cabal-install-solver-dep
+  ghc-options: -rtsopts -threaded
+  type: exitcode-stdio-1.0
+  main-is: IntegrationTests2.hs
+  hs-source-dirs: tests
+  default-language: Haskell2010
+
+  build-depends:
+        bytestring,
+        cabal-install,
+        containers,
+        directory,
+        filepath,
+        tasty >= 1.2.3 && <1.4,
+        tasty-hunit >= 0.10,
+        tagged
+
+test-suite long-tests
+  import: warnings, base-dep, cabal-dep, cabal-install-solver-dep
+  ghc-options: -rtsopts -threaded
+  type: exitcode-stdio-1.0
+  hs-source-dirs: tests
+  main-is: LongTests.hs
+  default-language: Haskell2010
+
+  other-modules:
+    UnitTests.Distribution.Client.ArbitraryInstances
+    UnitTests.Distribution.Client.Described
+    UnitTests.Distribution.Client.DescribedInstances
+    UnitTests.Distribution.Client.FileMonitor
+    UnitTests.Distribution.Client.VCS
+    UnitTests.Distribution.Solver.Modular.DSL
+    UnitTests.Distribution.Solver.Modular.QuickCheck
+    UnitTests.Distribution.Solver.Modular.QuickCheck.Utils
+    UnitTests.Options
+    UnitTests.TempTestDir
 
-    if flag(debug-tracetree)
-      cpp-options: -DDEBUG_TRACETREE
-      build-depends: tracetree >= 0.1 && < 0.2
+  build-depends:
+        Cabal-QuickCheck,
+        Cabal-described,
+        cabal-install,
+        containers,
+        deepseq >= 1.2,
+        directory,
+        filepath,
+        hashable,
+        mtl,
+        network-uri >= 2.6.2.0 && <2.6.4.0,
+        random,
+        tagged,
+        tasty >= 1.2.3 && <1.4,
+        tasty-hunit >= 0.10,
+        tasty-quickcheck,
+        QuickCheck >= 2.14 && <2.15,
+        pretty-show >= 1.6.15