Fix test stanzas ignored thing

haskell · Mar 5, 2024 · 08689b9 · 08689b9
1 parent b3b1ff3
commit 08689b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs b/cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs
@@ -52,8 +52,10 @@ data ConstraintScope
      -- | The package with the specified name and qualifier.
    | ScopeQualified Namespace Qualifier PackageName
 
-   -- ROMES:TODO: Should I try to delete this? It will not be easy because it will go down to the constraint syntax
-   -- Apply a constraint to a private-build-depends scope
+    -- TODO Better Comment: Apply a constraint to a private-build-depends scope
+    -- It is not sufficient to have ScopeQualified because we don't have enough
+    -- information in the constraint syntax to fill in the `Component` field of
+    -- `QualAlias`
    | ScopePrivate PackageName PrivateAlias PackageName
      -- | The package with the specified name when it has a
      -- setup qualifier.
@@ -79,7 +81,6 @@ scopeToPackageName (ScopePrivate _ _ pn) = pn
 
 -- TODO: Crucial (RM: Why did you write this Matthew?!)
 constraintScopeMatches :: ConstraintScope -> QPN -> Bool
---constraintScopeMatches cs qpn | traceShow (cs, qpn) False = undefined
 constraintScopeMatches (ScopeTarget pn) (Q (PackagePath ns q) pn') =
   let namespaceMatches DefaultNamespace = True
       namespaceMatches (Independent namespacePn) = pn == namespacePn

diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL.hs
@@ -871,7 +871,7 @@ exResolve
             fmap
               ( \p ->
                   PackageConstraint
-                    (scopeToplevel (C.mkPackageName p))
+                    (ScopeAnyQualifier (C.mkPackageName p))
                     (PackagePropertyStanzas [TestStanzas])
               )
               (exDbPkgs db)