Fix tests

haskell · Jul 15, 2024 · d1d698a · d1d698a
1 parent cef49cd
commit d1d698a
Show file tree

Hide file tree

Showing 45 changed files with 136 additions and 52 deletions.
diff --git a/Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs b/Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs
@@ -520,11 +520,11 @@ finalizePD
       -- Combine lib, exes, and tests into one list of @CondTree@s with tagged data
       condTrees =
         maybeToList (fmap (mapTreeData Lib . appBounds) mb_lib0)
-            ++ map (\(name, tree) -> mapTreeData (SubComp name . CLib)   $ appBounds tree) sub_libs0
-            ++ map (\(name, tree) -> mapTreeData (SubComp name . CFLib)  $ appBounds tree) flibs0
-            ++ map (\(name, tree) -> mapTreeData (SubComp name . CExe)   $ appBounds tree) exes0
-            ++ map (\(name, tree) -> mapTreeData (SubComp name . CTest)  $ appBounds tree) tests0
-            ++ map (\(name, tree) -> mapTreeData (SubComp name . CBench) $ appBounds tree) bms0
+          ++ map (\(name, tree) -> mapTreeData (SubComp name . CLib) $ appBounds tree) sub_libs0
+          ++ map (\(name, tree) -> mapTreeData (SubComp name . CFLib) $ appBounds tree) flibs0
+          ++ map (\(name, tree) -> mapTreeData (SubComp name . CExe) $ appBounds tree) exes0
+          ++ map (\(name, tree) -> mapTreeData (SubComp name . CTest) $ appBounds tree) tests0
+          ++ map (\(name, tree) -> mapTreeData (SubComp name . CBench) $ appBounds tree) bms0
 
       flagChoices = map (\(MkPackageFlag n _ d manual) -> (n, d2c manual n d)) flags
       d2c manual n b = case lookupFlagAssignment n userflags of

diff --git a/Cabal-syntax/src/Distribution/Types/DefaultBounds.hs b/Cabal-syntax/src/Distribution/Types/DefaultBounds.hs
@@ -35,14 +35,14 @@ applyDefaultBoundsToCondTree
   -> CondTree cv [Dependency] a
   -> CondTree cv [Dependency] a
 applyDefaultBoundsToCondTree db =
-    mapTreeData (applyDefaultBoundsToBuildInfo db)
-  . mapTreeConstrs (applyDefaultBoundsToDependencies db)
+  mapTreeData (applyDefaultBoundsToBuildInfo db)
+    . mapTreeConstrs (applyDefaultBoundsToDependencies db)
 
 applyDefaultBoundsToBuildInfo :: L.HasBuildInfo a => DefaultBounds -> a -> a
 applyDefaultBoundsToBuildInfo db bi =
   bi
     & L.targetBuildDepends %~ applyDefaultBoundsToDependencies db
-    & L.buildToolDepends   %~ applyDefaultBoundsToExeDependencies db
+    & L.buildToolDepends %~ applyDefaultBoundsToExeDependencies db
 
 applyDefaultBoundsToDependencies :: DefaultBounds -> [Dependency] -> [Dependency]
 applyDefaultBoundsToDependencies (DefaultBounds [] _) = id

diff --git a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr
@@ -70,7 +70,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/anynone.expr b/Cabal-tests/tests/ParserTests/regressions/anynone.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/big-version.expr b/Cabal-tests/tests/ParserTests/regressions/big-version.expr
@@ -38,7 +38,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr b/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr
@@ -53,7 +53,9 @@ GenericPackageDescription {
       flagDefault = True,
       flagManual = True}],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common.expr b/Cabal-tests/tests/ParserTests/regressions/common.expr
@@ -51,7 +51,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common2.expr b/Cabal-tests/tests/ParserTests/regressions/common2.expr
@@ -47,7 +47,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common3.expr b/Cabal-tests/tests/ParserTests/regressions/common3.expr
@@ -51,7 +51,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/elif.expr b/Cabal-tests/tests/ParserTests/regressions/elif.expr
@@ -46,7 +46,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/elif2.expr b/Cabal-tests/tests/ParserTests/regressions/elif2.expr
@@ -46,7 +46,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr
@@ -51,7 +51,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr b/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr
@@ -127,7 +127,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr
@@ -70,7 +70,9 @@ GenericPackageDescription {
       flagDefault = False,
       flagManual = False}],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr
@@ -38,7 +38,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation.expr b/Cabal-tests/tests/ParserTests/regressions/indentation.expr
@@ -48,7 +48,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation2.expr b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr
@@ -41,7 +41,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation3.expr b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr
@@ -43,7 +43,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr
@@ -38,7 +38,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-774.expr b/Cabal-tests/tests/ParserTests/regressions/issue-774.expr
@@ -45,7 +45,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr
@@ -77,7 +77,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr
@@ -38,7 +38,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr
@@ -38,7 +38,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq1.expr b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr
@@ -121,7 +121,9 @@ GenericPackageDescription {
       flagDefault = False,
       flagManual = True}],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq2.expr b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr
@@ -125,7 +125,9 @@ GenericPackageDescription {
       flagDefault = False,
       flagManual = True}],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr
@@ -36,7 +36,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/monad-param.expr b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr
@@ -46,7 +46,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr
@@ -38,7 +38,9 @@ GenericPackageDescription {
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   genDefaultPackageBounds =
-  Nothing,
+  DefaultBounds {
+    defaultTargetBuildDepends = [],
+    defaultBuildToolDepends = []},
   condLibrary = Just
     CondNode {
       condTreeData = Library {