Merge pull request #11541 from geekosaur/solver-tests

Add solver tests to validate

Author: mergify[bot]

.github/workflows/validate.yml

@@ -232,7 +232,7 @@ jobs:
         run: |
           set +e
           rc=0
-          tests="lib-tests lib-suite cli-tests cli-suite"
+          tests="lib-tests lib-suite cli-tests cli-suite solver-tests"
           if [ "${{ matrix.ghc }}" = "${{ env.GHC_FOR_SOLVER_BENCHMARKS }}" ]; then
             tests="$tests solver-benchmarks-tests solver-benchmarks-run"
           fi

cabal-validate/src/Cli.hs

@@ -198,6 +198,7 @@ resolveOpts opts = do
               , optional (rawRunLibSuite opts && not (null (rawExtraCompilers opts))) LibSuiteExtras
               , optional (rawRunCliTests opts && not (rawLibOnly opts)) CliTests
               , optional (rawRunCliSuite opts && not (rawLibOnly opts)) CliSuite
+              , optional (rawRunSolverTests opts) SolverTests
               , optionals (rawSolverBenchmarks opts) [SolverBenchmarksTests, SolverBenchmarksRun]
               ]
 
@@ -211,6 +212,7 @@ resolveOpts opts = do
             , "Cabal-QuickCheck"
             , "Cabal-tree-diff"
             , "Cabal-described"
+            , "cabal-install-solver"
             ]
           , optionals
               (not (rawLibOnly opts))
@@ -303,6 +305,7 @@ data RawOpts = RawOpts
   , rawRunCliTests :: Bool
   , rawRunLibSuite :: Bool
   , rawRunCliSuite :: Bool
+  , rawRunSolverTests :: Bool
   , rawSolverBenchmarks :: Bool
   , rawHackageTests :: HackageTests
   }
@@ -418,6 +421,11 @@ rawOptsParser =
       "run-cli-suite"
       ( help "Run `cabal-testsuite` with the `cabal-install` executable"
       )
+    <*> boolOption
+      True
+      "run-solver-tests"
+      ( help "Run `cabal-install-solver` tests"
+      )
     <*> boolOption
       False
       "solver-benchmarks"

cabal-validate/src/Main.hs

@@ -56,6 +56,7 @@ runStep opts step = do
         LibSuiteExtras -> libSuiteExtras opts
         CliSuite -> cliSuite opts
         CliTests -> cliTests opts
+        SolverTests -> solverTests opts
         SolverBenchmarksTests -> solverBenchmarksTests opts
         SolverBenchmarksRun -> solverBenchmarksRun opts
   withTiming (startTime opts) title action
@@ -409,6 +410,17 @@ cliSuite opts = do
         ++ rtsArgs opts
     )
 
+-- | Run the @cabal-install-solver@ unit tests
+solverTests :: Opts -> IO ()
+solverTests opts = do
+  command <- cabalListBin opts "cabal-install-solver:test:unit-tests"
+
+  timedWithCwd
+    opts
+    "cabal-install-solver"
+    command
+    []
+
 -- | Run the @solver-benchmarks@ unit tests.
 solverBenchmarksTests :: Opts -> IO ()
 solverBenchmarksTests opts = do

cabal-validate/src/Step.hs

@@ -18,6 +18,7 @@ data Step
   | LibSuiteExtras
   | CliTests
   | CliSuite
+  | SolverTests
   | SolverBenchmarksTests
   | SolverBenchmarksRun
   deriving (Eq, Enum, Bounded, Show)
@@ -38,6 +39,7 @@ displayStep step =
     LibSuiteExtras -> "lib-suite-extras"
     CliTests -> "cli-tests"
     CliSuite -> "cli-suite"
+    SolverTests -> "solver-tests"
     SolverBenchmarksTests -> "solver-benchmarks-tests"
     SolverBenchmarksRun -> "solver-benchmarks-run"
 

cabal.validate.project

@@ -17,3 +17,6 @@ package cabal-install
 
 package Cabal
   flags: +git-rev
+
+package cabal-install-solver
+  flags: +debug-expensive-assertions