Fix tests for default-package-bounds

haskell · Jun 26, 2024 · 0f17eff · 0f17eff
1 parent b2e828f
commit 0f17eff
Show file tree

Hide file tree

Showing 53 changed files with 180 additions and 5 deletions.
diff --git a/Cabal-tests/tests/NoThunks.hs b/Cabal-tests/tests/NoThunks.hs
@@ -69,6 +69,7 @@ instance NoThunks BuildType
 instance NoThunks CabalSpecVersion
 instance NoThunks CompilerFlavor
 instance NoThunks ConfVar
+instance NoThunks DefaultBounds
 instance NoThunks Dependency
 instance NoThunks Executable
 instance NoThunks ExecutableScope

diff --git a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr
@@ -69,6 +69,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/anynone.expr b/Cabal-tests/tests/ParserTests/regressions/anynone.expr
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -52,6 +52,8 @@ GenericPackageDescription {
       flagDescription = "",
       flagDefault = True,
       flagManual = True}],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common.expr b/Cabal-tests/tests/ParserTests/regressions/common.expr
@@ -50,6 +50,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common2.expr b/Cabal-tests/tests/ParserTests/regressions/common2.expr
@@ -46,6 +46,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/common3.expr b/Cabal-tests/tests/ParserTests/regressions/common3.expr
@@ -50,6 +50,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/elif.expr b/Cabal-tests/tests/ParserTests/regressions/elif.expr
@@ -45,6 +45,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/elif2.expr b/Cabal-tests/tests/ParserTests/regressions/elif2.expr
@@ -45,6 +45,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -50,6 +50,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -126,6 +126,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr
@@ -69,6 +69,8 @@ GenericPackageDescription {
       "only build with Double and Long support",
       flagDefault = False,
       flagManual = False}],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation.expr b/Cabal-tests/tests/ParserTests/regressions/indentation.expr
@@ -47,6 +47,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation2.expr b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr
@@ -40,6 +40,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation3.expr b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr
@@ -42,6 +42,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -44,6 +44,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -76,6 +76,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq1.expr b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr
@@ -120,6 +120,8 @@ GenericPackageDescription {
       flagDescription = "",
       flagDefault = False,
       flagManual = True}],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq2.expr b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr
@@ -124,6 +124,8 @@ GenericPackageDescription {
       flagDescription = "",
       flagDefault = False,
       flagManual = True}],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr
@@ -35,6 +35,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Nothing,
   condSubLibraries = [],
   condForeignLibs = [],

diff --git a/Cabal-tests/tests/ParserTests/regressions/monad-param.expr b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr
@@ -45,6 +45,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   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
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/noVersion.expr b/Cabal-tests/tests/ParserTests/regressions/noVersion.expr
@@ -37,6 +37,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr
@@ -52,6 +52,8 @@ GenericPackageDescription {
       flagDescription = "\28961",
       flagDefault = True,
       flagManual = False}],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/shake.expr b/Cabal-tests/tests/ParserTests/regressions/shake.expr
@@ -158,6 +158,8 @@ GenericPackageDescription {
       "Obtain FileTime using portable functions",
       flagDefault = False,
       flagManual = True}],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr
@@ -36,6 +36,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr
@@ -40,6 +40,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr
@@ -40,6 +40,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr
@@ -64,6 +64,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/version-sets.expr b/Cabal-tests/tests/ParserTests/regressions/version-sets.expr
@@ -62,6 +62,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr
@@ -54,6 +54,8 @@ GenericPackageDescription {
     extraDocFiles = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
+  genDefaultPackageBounds =
+  Nothing,
   condLibrary = Just
     CondNode {
       condTreeData = Library {

diff --git a/Cabal-tests/tests/UnitTests/Distribution/PackageDescription/Check.hs b/Cabal-tests/tests/UnitTests/Distribution/PackageDescription/Check.hs
@@ -32,6 +32,5 @@ tests =
     longerThan = filter ((>25). length) allExplanationIdStrings
 
     usingTooManyDashes :: [CheckExplanationIDString]
-    usingTooManyDashes = filter ((>2) . length . filter (=='-'))
+    usingTooManyDashes = filter ((>3) . length . filter (=='-'))
                            allExplanationIdStrings
-