From bbed799b6d1e0e42e7b7602fe7ed9465326a6ddc Mon Sep 17 00:00:00 2001 From: Liang-Ting Chen Date: Fri, 18 Aug 2023 12:57:52 +0800 Subject: [PATCH] Update tests --- .../tests/ParserTests/ipi/Includes2.cabal | 1 + .../tests/ParserTests/ipi/Includes2.expr | 1 + .../tests/ParserTests/ipi/Includes2.format | 1 + .../ipi/internal-preprocessor-test.cabal | 1 + .../ipi/internal-preprocessor-test.expr | 1 + .../ipi/internal-preprocessor-test.format | 1 + .../ParserTests/ipi/issue-2276-ghc-9885.cabal | 1 + .../ParserTests/ipi/issue-2276-ghc-9885.expr | 1 + .../ipi/issue-2276-ghc-9885.format | 1 + .../tests/ParserTests/ipi/transformers.cabal | 1 + .../tests/ParserTests/ipi/transformers.expr | 1 + .../tests/ParserTests/ipi/transformers.format | 1 + .../ParserTests/regressions/Octree-0.5.format | 2 +- .../regressions/generics-sop.format | 2 +- .../regressions/jaeger-flamegraph.format | 2 +- .../ParserTests/regressions/libpq1.format | 2 +- .../ParserTests/regressions/libpq2.format | 2 +- .../regressions/monad-param.format | 22 +++++++++---------- .../ParserTests/regressions/shake.format | 2 +- .../regressions/th-lift-instances.format | 2 +- .../regressions/wl-pprint-indef.format | 2 +- .../Distribution/Utils/Structured.hs | 2 +- 22 files changed, 32 insertions(+), 20 deletions(-) diff --git a/Cabal-tests/tests/ParserTests/ipi/Includes2.cabal b/Cabal-tests/tests/ParserTests/ipi/Includes2.cabal index efaad1e6540..af1d7ceae01 100644 --- a/Cabal-tests/tests/ParserTests/ipi/Includes2.cabal +++ b/Cabal-tests/tests/ParserTests/ipi/Includes2.cabal @@ -6,6 +6,7 @@ package-name: Includes2 lib-name: mylib key: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n license: BSD3 +license-files: LICENSE maintainer: ezyang@cs.stanford.edu author: Edward Z. Yang exposed: False diff --git a/Cabal-tests/tests/ParserTests/ipi/Includes2.expr b/Cabal-tests/tests/ParserTests/ipi/Includes2.expr index 9c15199c79f..6e85371790d 100644 --- a/Cabal-tests/tests/ParserTests/ipi/Includes2.expr +++ b/Cabal-tests/tests/ParserTests/ipi/Includes2.expr @@ -25,6 +25,7 @@ InstalledPackageInfo { compatPackageKey = "Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n", license = Right BSD3, + licenseFiles = ["LICENSE"], copyright = "", maintainer = "ezyang@cs.stanford.edu", diff --git a/Cabal-tests/tests/ParserTests/ipi/Includes2.format b/Cabal-tests/tests/ParserTests/ipi/Includes2.format index ab6445d811d..c7c0a53fa2c 100644 --- a/Cabal-tests/tests/ParserTests/ipi/Includes2.format +++ b/Cabal-tests/tests/ParserTests/ipi/Includes2.format @@ -6,6 +6,7 @@ id: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n instantiated-with: Database=Includes2-0.1.0.0-inplace-mysql:Database.MySQL key: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n license: BSD3 +license-files: LICENSE maintainer: ezyang@cs.stanford.edu author: Edward Z. Yang abi: inplace diff --git a/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.cabal b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.cabal index 084aa135231..e1bf9dae72f 100644 --- a/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.cabal +++ b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.cabal @@ -3,6 +3,7 @@ version: 0.1.0.0 id: internal-preprocessor-test-0.1.0.0 key: internal-preprocessor-test-0.1.0.0 license: GPL-3 +license-files: LICENSE maintainer: mikhail.glushenkov@gmail.com synopsis: Internal custom preprocessor example. description: diff --git a/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr index 42a593f2540..0974bed4ec4 100644 --- a/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr +++ b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr @@ -17,6 +17,7 @@ InstalledPackageInfo { "internal-preprocessor-test-0.1.0.0", license = Right (GPL (Just (mkVersion [3]))), + licenseFiles = ["LICENSE"], copyright = "", maintainer = "mikhail.glushenkov@gmail.com", diff --git a/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.format b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.format index ad305dae422..f122b851b39 100644 --- a/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.format +++ b/Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.format @@ -4,6 +4,7 @@ visibility: public id: internal-preprocessor-test-0.1.0.0 key: internal-preprocessor-test-0.1.0.0 license: GPL-3 +license-files: LICENSE maintainer: mikhail.glushenkov@gmail.com author: Mikhail Glushenkov synopsis: Internal custom preprocessor example. diff --git a/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal index c7319e41842..c730e2ccf85 100644 --- a/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal +++ b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.cabal @@ -3,6 +3,7 @@ version: 0.5.2.0 id: transformers-0.5.2.0 key: transformers-0.5.2.0 license: BSD3 +license-files: LICENSE maintainer: Ross Paterson synopsis: Concrete functor and monad transformers description: diff --git a/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr index f2d62e05938..f1426361994 100644 --- a/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr +++ b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr @@ -16,6 +16,7 @@ InstalledPackageInfo { compatPackageKey = "transformers-0.5.2.0", license = Right BSD3, + licenseFiles = ["LICENSE"], copyright = "", maintainer = "Ross Paterson ", diff --git a/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.format b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.format index 281203ceb09..22957fba7f8 100644 --- a/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.format +++ b/Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.format @@ -4,6 +4,7 @@ visibility: public id: transformers-0.5.2.0 key: transformers-0.5.2.0 license: BSD3 +license-files: LICENSE maintainer: Ross Paterson author: Andy Gill, Ross Paterson synopsis: Concrete functor and monad transformers diff --git a/Cabal-tests/tests/ParserTests/ipi/transformers.cabal b/Cabal-tests/tests/ParserTests/ipi/transformers.cabal index 2c6387c2206..53fa014b3e9 100644 --- a/Cabal-tests/tests/ParserTests/ipi/transformers.cabal +++ b/Cabal-tests/tests/ParserTests/ipi/transformers.cabal @@ -3,6 +3,7 @@ version: 0.5.2.0 id: transformers-0.5.2.0 key: transformers-0.5.2.0 license: BSD3 +license-files: LICENSE maintainer: Ross Paterson synopsis: Concrete functor and monad transformers description: diff --git a/Cabal-tests/tests/ParserTests/ipi/transformers.expr b/Cabal-tests/tests/ParserTests/ipi/transformers.expr index daef7608a77..759453fe669 100644 --- a/Cabal-tests/tests/ParserTests/ipi/transformers.expr +++ b/Cabal-tests/tests/ParserTests/ipi/transformers.expr @@ -16,6 +16,7 @@ InstalledPackageInfo { compatPackageKey = "transformers-0.5.2.0", license = Right BSD3, + licenseFiles = ["LICENSE"], copyright = "", maintainer = "Ross Paterson ", diff --git a/Cabal-tests/tests/ParserTests/ipi/transformers.format b/Cabal-tests/tests/ParserTests/ipi/transformers.format index 66a0e14e5b5..aa88fdc8791 100644 --- a/Cabal-tests/tests/ParserTests/ipi/transformers.format +++ b/Cabal-tests/tests/ParserTests/ipi/transformers.format @@ -4,6 +4,7 @@ visibility: public id: transformers-0.5.2.0 key: transformers-0.5.2.0 license: BSD3 +license-files: LICENSE maintainer: Ross Paterson author: Andy Gill, Ross Paterson synopsis: Concrete functor and monad transformers diff --git a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.format b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.format index 7d72803f0a5..980dd3de04a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.format +++ b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.format @@ -3,7 +3,7 @@ cabal-version: >=1.8 name: Octree version: 0.5 license: BSD3 -license-file: LICENSE +license-files: LICENSE copyright: Copyright by Michal J. Gajda '2012 maintainer: mjgajda@googlemail.com author: Michal J. Gajda diff --git a/Cabal-tests/tests/ParserTests/regressions/generics-sop.format b/Cabal-tests/tests/ParserTests/regressions/generics-sop.format index eaf3cf62dd6..93fb8aebc33 100644 --- a/Cabal-tests/tests/ParserTests/regressions/generics-sop.format +++ b/Cabal-tests/tests/ParserTests/regressions/generics-sop.format @@ -2,7 +2,7 @@ cabal-version: >=1.10 name: generics-sop version: 0.3.1.0 license: BSD3 -license-file: LICENSE +license-files: LICENSE maintainer: andres@well-typed.com author: Edsko de Vries , Andres Löh diff --git a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.format b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.format index 21f0adf1b54..45747eea7e0 100644 --- a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.format +++ b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.format @@ -2,7 +2,7 @@ cabal-version: 2.2 name: jaeger-flamegraph version: 1.0.0 license: BSD-3-Clause -license-file: LICENSE +license-files: LICENSE copyright: (c) 2018 Symbiont.io maintainer: Sam Halliday author: Sam Halliday diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq1.format b/Cabal-tests/tests/ParserTests/regressions/libpq1.format index 2326cd6740c..a74a5043aaf 100644 --- a/Cabal-tests/tests/ParserTests/regressions/libpq1.format +++ b/Cabal-tests/tests/ParserTests/regressions/libpq1.format @@ -2,7 +2,7 @@ cabal-version: >=1.8 name: postgresql-libpq version: 0.9.4.2 license: BSD3 -license-file: LICENSE +license-files: LICENSE copyright: (c) 2010 Grant Monroe (c) 2011 Leon P Smith diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq2.format b/Cabal-tests/tests/ParserTests/regressions/libpq2.format index 596763d5ecd..086b143b8fd 100644 --- a/Cabal-tests/tests/ParserTests/regressions/libpq2.format +++ b/Cabal-tests/tests/ParserTests/regressions/libpq2.format @@ -2,7 +2,7 @@ cabal-version: 3.0 name: postgresql-libpq version: 0.9.4.2 license: BSD-3-Clause -license-file: LICENSE +license-files: LICENSE copyright: (c) 2010 Grant Monroe (c) 2011 Leon P Smith diff --git a/Cabal-tests/tests/ParserTests/regressions/monad-param.format b/Cabal-tests/tests/ParserTests/regressions/monad-param.format index 360a94bc825..579e9514d7b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/monad-param.format +++ b/Cabal-tests/tests/ParserTests/regressions/monad-param.format @@ -1,21 +1,21 @@ monad-param.cabal:19:1: Tabs used as indentation at 19:1, 20:1 -name: monad-param -version: 0.0.1 -license: BSD3 -license-file: LICENSE -copyright: Copyright (C) 2006-2007, Edward Kmett -maintainer: Edward Kmett -author: Edward Kmett -stability: alpha +name: monad-param +version: 0.0.1 +license: BSD3 +license-files: LICENSE +copyright: Copyright (C) 2006-2007, Edward Kmett +maintainer: Edward Kmett +author: Edward Kmett +stability: alpha homepage: http://comonad.com/haskell/monad-param/dist/doc/html/Control-Monad-Parameterized.html -package-url: http://comonad.com/haskell/monad-param -synopsis: Parameterized monads +package-url: http://comonad.com/haskell/monad-param +synopsis: Parameterized monads description: Implements parameterized monads by overloading the monad sugar with more liberal types. -category: Control +category: Control library exposed-modules: Control.Monad.Parameterized diff --git a/Cabal-tests/tests/ParserTests/regressions/shake.format b/Cabal-tests/tests/ParserTests/regressions/shake.format index fed741d8eed..ec5aac95467 100644 --- a/Cabal-tests/tests/ParserTests/regressions/shake.format +++ b/Cabal-tests/tests/ParserTests/regressions/shake.format @@ -2,7 +2,7 @@ cabal-version: 1.18 name: shake version: 0.15.11 license: BSD3 -license-file: LICENSE +license-files: LICENSE copyright: Neil Mitchell 2011-2017 maintainer: Neil Mitchell author: Neil Mitchell diff --git a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.format b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.format index 8fe7579952d..e1dc8f13112 100644 --- a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.format +++ b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.format @@ -3,7 +3,7 @@ cabal-version: >=1.10 name: th-lift-instances version: 0.1.4 license: BSD3 -license-file: LICENSE +license-files: LICENSE copyright: Copyright (C) 2013-2014 Benno Fünfstück maintainer: Benno Fünfstück author: Benno Fünfstück diff --git a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.format b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.format index 1a16e964b06..2743ec0dde3 100644 --- a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.format +++ b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.format @@ -5,7 +5,7 @@ cabal-version: >=1.6 name: wl-pprint-indef version: 1.2 license: BSD3 -license-file: LICENSE +license-files: LICENSE maintainer: Noam Lewis author: Daan Leijen synopsis: The Wadler/Leijen Pretty Printer diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs index f2d22f7755a..f93b9402ee5 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs @@ -29,7 +29,7 @@ tests = testGroup "Distribution.Utils.Structured" , testCase "GenericPackageDescription" $ md5Check (Proxy :: Proxy GenericPackageDescription) 0xedd391339de1201511636bbb563fa5db , testCase "LocalBuildInfo" $ - md5Check (Proxy :: Proxy LocalBuildInfo) 0x40253e3699453643336bdc7911717af0 + md5Check (Proxy :: Proxy LocalBuildInfo) 0x70da7ec48f751a73d4958e5fc0bbd25e #endif ]