Skip to content

Commit

Permalink
Captured last failing tests from the roundtrip
Browse files Browse the repository at this point in the history
When https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12556
and https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12557
land, and all are backported, GHC 9.10.1 should be good to go.

Last few failures (in ghc910 test dir) are internal to ghc-exactprint
itself, which needs minor tweaks.
  • Loading branch information
alanz committed May 2, 2024
1 parent 5f9f91e commit ccccc48
Show file tree
Hide file tree
Showing 9 changed files with 1,429 additions and 10 deletions.
140 changes: 140 additions & 0 deletions roundtrip-config/knownfailures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,143 @@
./hackage-roundtrip-work/ghc-lib-parser-9.8.2.20240223/libraries/ghc-boot/GHC/Unit/Database.hs
./hackage-roundtrip-work/git-annex-10.20240227/Utility/MoveFile.hs
./hackage-roundtrip-work/ghc-lib-9.8.2.20240223/compiler/GHC/Tc/Module.hs
./hackage-roundtrip-work/base-4.19.1.0/Foreign/C/String.hs
./hackage-roundtrip-work/cnc-spec-compiler-0.2.0.1/Intel/Cnc/Spec/MainExecutable.hs
./hackage-roundtrip-work/darcs-2.18.2/src/Darcs/UI/External.hs
./hackage-roundtrip-work/data-store-0.3.0.7/benchmarks/src/01.hs
./hackage-roundtrip-work/dlist-1.0/tests/OverloadedStrings.hs
./hackage-roundtrip-work/error-or-utils-0.2.0/src/Data/ErrorOr/Validation.hs
./hackage-roundtrip-work/encoding-0.8.9/Data/Static.hs
./hackage-roundtrip-work/fudgets-0.18.4/hsrc/layout/TableP.hs
./hackage-roundtrip-work/gauge-0.2.5/Gauge/Main.hs
./hackage-roundtrip-work/generic-data-surgery-0.3.0.0/test/surgery.hs
./hackage-roundtrip-work/ghc-boot-9.8.1/GHC/Unit/Database.hs
./hackage-roundtrip-work/ghc-heap-9.8.1/GHC/Exts/Heap/Closures.hs
./hackage-roundtrip-work/ghc-mod-5.8.0.0/core/GhcMod/DynFlagsTH.hs
./hackage-roundtrip-work/gigaparsec-0.3.0.0/src/Text/Gigaparsec/Patterns.hs
./hackage-roundtrip-work/ghc-lib-parser-9.8.2.20240223/libraries/ghc-heap/GHC/Exts/Heap/Closures.hs
./hackage-roundtrip-work/github-backup-1.20200721/Utility/Directory.hs
./hackage-roundtrip-work/git-repair-1.20230814/Utility/MoveFile.hs
./hackage-roundtrip-work/ghc-simple-0.4/src/Language/Haskell/GHC/Simple/PrimIface.hs
./hackage-roundtrip-work/git-annex-10.20240227/Annex/TransferrerPool.hs
./hackage-roundtrip-work/hackport-0.8.5.1/cabal/cabal-install/src/Distribution/Client/SetupWrapper.hs
./hackage-roundtrip-work/hackport-0.8.5.1/cabal/Cabal/src/Distribution/Compat/Internal/TempFile.hs
./hackage-roundtrip-work/hackport-0.8.5.1/cabal/cabal-install/src/Distribution/Client/BuildReports/Upload.hs
./hackage-roundtrip-work/HaRe-0.8.4.1/src/Language/Haskell/Refact/Utils/GhcUtils.hs
./hackage-roundtrip-work/happstack-server-7.9.0/src/Happstack/Server/Internal/Listen.hs
./hackage-roundtrip-work/haskell-lsp-types-0.24.0.0/src/Language/Haskell/LSP/Types/MarkupContent.hs
./hackage-roundtrip-work/hanabi-dealer-0.15.1.1/Game/Hanabi/Client.hs
./hackage-roundtrip-work/HaRe-0.8.4.1/src/Language/Haskell/Refact/Refactoring/AddRmParam.hs
./hackage-roundtrip-work/haskell2010-1.1.2.0/Foreign/StablePtr.hs
./hackage-roundtrip-work/hanabi-dealer-0.15.1.1/Game/Hanabi/Strategies/AdaptiveLMC.hs
./hackage-roundtrip-work/haskell-lsp-types-0.24.0.0/src/Language/Haskell/LSP/Types/WorkspaceEdit.hs
./hackage-roundtrip-work/haxl-2.4.0.0/Haxl/Core/Monad.hs
./hackage-roundtrip-work/hanabi-dealer-0.15.1.1/Game/Hanabi/Strategies/LazyMC.hs
./hackage-roundtrip-work/HaRe-0.8.4.1/src/Language/Haskell/Refact/Refactoring/Case.hs
./hackage-roundtrip-work/HaRe-0.8.4.1/src/Language/Haskell/Refact/Utils/TypeUtils.hs
./hackage-roundtrip-work/hermit-1.0.1/src/HERMIT/Kure.hs
./hackage-roundtrip-work/hie-compat-0.3.1.2/src-ghc92/Compat/HieAst.hs
./hackage-roundtrip-work/HaRe-0.8.4.1/src/Language/Haskell/Refact/Refactoring/SwapArgs.hs
./hackage-roundtrip-work/hmpfr-0.4.5/src/Data/Number/MPFR.hs
./hackage-roundtrip-work/HaRe-0.8.4.1/src/Language/Haskell/Refact/Utils/Transform.hs
./hackage-roundtrip-work/hoodle-core-0.16.0/src/Hoodle/Coroutine/ContextMenu.hs
./hackage-roundtrip-work/hpp-0.6.5/src/Hpp/Preprocessing.hs
./hackage-roundtrip-work/hsinspect-0.1.0/library/HsInspect/Imports.hs
./hackage-roundtrip-work/hsinspect-0.1.0/library/HsInspect/Runner.hs
./hackage-roundtrip-work/htvm-0.1.2/src/HTVM/EDSL/Monad.hs
./hackage-roundtrip-work/hunt-server-0.3.0.2/src/Hunt/Server/Common.hs
./hackage-roundtrip-work/hs-fltk-0.2.5/src/Graphics/UI/FLTK/MultiBrowser.hs
./hackage-roundtrip-work/inline-c-cpp-0.5.0.2/test/tests.hs
./hackage-roundtrip-work/inbox-0.2.0/src/Test/Inbox.hs
./hackage-roundtrip-work/kan-extensions-5.2.5/src/Control/Monad/Codensity.hs
./hackage-roundtrip-work/inline-r-1.0.1/src/Language/R/QQ.hs
./hackage-roundtrip-work/iterIO-0.2.2/Data/IterIO.hs
./hackage-roundtrip-work/Hs2lib-0.6.3/WinDll/Parsers/Hs2lib.hs
./hackage-roundtrip-work/haskell-lsp-types-0.24.0.0/src/Language/Haskell/LSP/Types/Hover.hs
./hackage-roundtrip-work/KiCS-0.9.3/dist/build/Curry/Module/Prelude.hs
./hackage-roundtrip-work/hanabi-dealer-0.15.1.1/Game/Hanabi/Strategies/EndGameSearch.hs
./hackage-roundtrip-work/husk-scheme-3.20/hs-src/Language/Scheme/Core.hs
./hackage-roundtrip-work/hakyll-4.16.2.0/lib/Hakyll/Core/UnixFilter.hs
./hackage-roundtrip-work/haskell2010-1.1.2.0/Foreign/C/String.hs
./hackage-roundtrip-work/hlint-3.8/src/CmdLine.hs
./hackage-roundtrip-work/lambdabot-haskell-plugins-5.3.1.2/src/Lambdabot/Plugin/Haskell/Eval.hs
./hackage-roundtrip-work/lambdabot-telegram-plugins-0.2.1/src/Lambdabot/Plugin/Telegram.hs
./hackage-roundtrip-work/language-bluespec-0.1/src/Language/Bluespec/Log2.hs
./hackage-roundtrip-work/liquidhaskell-boot-0.9.8.1/src/Language/Haskell/Liquid/GHC/Misc.hs
./hackage-roundtrip-work/libconfig-0.3.0.0/src/Language/Libconfig/Types.hs
./hackage-roundtrip-work/lvish-1.1.4/Data/LVar/SatMap.hs
./hackage-roundtrip-work/lsp-test-0.17.0.0/src/Language/LSP/Test/Session.hs
./hackage-roundtrip-work/lvish-1.1.4/Control/LVish/Logging.hs
./hackage-roundtrip-work/mellon-core-0.8.0.7/test/Mellon/Controller/AsyncSpec.hs
./hackage-roundtrip-work/MagicHaskeller-0.9.7.1/MagicHaskeller/VersionInfo.hs
./hackage-roundtrip-work/liquid-fixpoint-0.9.6.3/src/Language/Fixpoint/Horn/Transformations.hs
./hackage-roundtrip-work/MagicHaskeller-0.9.7.1/MagicHaskeller/TimeOut.hs
./hackage-roundtrip-work/MagicHaskeller-0.9.7.1/MagicHaskeller/Options.hs
./hackage-roundtrip-work/monadic-bang-0.2.1.0/test/MonadicBang/Test/ShouldPass.hs
./hackage-roundtrip-work/microlens-th-0.4.3.15/test/templates.hs
./hackage-roundtrip-work/mime-mail-0.5.1/Network/Mail/Mime.hs
./hackage-roundtrip-work/logfloat-0.14.0/src/Data/Number/LogFloat.hs
./hackage-roundtrip-work/lockfree-queue-0.2.4/Data/Concurrent/Queue/MichaelScott.hs
./hackage-roundtrip-work/mptcp-pm-0.0.5/src/app/Main.hs
./hackage-roundtrip-work/mptcpanalyzer-0.0.2.0/src/Tshark/Capture.hs
./hackage-roundtrip-work/netcore-1.0.0/nettle-openflow/src/Nettle/OpenFlow/Statistics.hs
./hackage-roundtrip-work/NGLess-1.5.0/NGLess/Interpretation/Write.hs
./hackage-roundtrip-work/nettle-openflow-0.2.0/src/Nettle/OpenFlow/Statistics.hs
./hackage-roundtrip-work/ONC-RPC-0.2/Network/ONCRPC/Client.hs
./hackage-roundtrip-work/openapi-petstore-0.0.4.0/lib/OpenAPIPetstore/Logging.hs
./hackage-roundtrip-work/paragon-0.1.28/src/Language/Java/Paragon/Parser.hs
./hackage-roundtrip-work/Paraiso-0.3.1.5/Language/Paraiso/Generator/OMTrans.hs
./hackage-roundtrip-work/path-io-1.8.1/tests/Main.hs
./hackage-roundtrip-work/posit-2022.2.0.0/src/Posit.hs
./hackage-roundtrip-work/polysemy-1.9.1.3/test/FusionSpec.hs
./hackage-roundtrip-work/postgresql-libpq-notify-0.2.0.0/src/Database/PostgreSQL/LibPQ/Notify.hs
./hackage-roundtrip-work/proto3-suite-0.7.0/src/Proto3/Suite/DotProto/Generate.hs
./hackage-roundtrip-work/propellor-5.17/src/Utility/Directory.hs
./hackage-roundtrip-work/project-m36-0.9.9/src/lib/ProjectM36/AtomFunction.hs
./hackage-roundtrip-work/parameterized-data-0.1.6/src/Data/Param/FSVec.hs
./hackage-roundtrip-work/pugs-compat-0.0.6.20150815/src/Pugs/Compat/ID.hs
./hackage-roundtrip-work/record-dot-preprocessor-0.2.17/plugin/RecordDotPreprocessor.hs
./hackage-roundtrip-work/relude-1.2.1.0/src/Relude/Extra/Type.hs
./hackage-roundtrip-work/retrie-1.2.3/Retrie/CPP.hs
./hackage-roundtrip-work/scholdoc-citeproc-0.6/dist/build/Text/CSL/Data/Embedded.hs
./hackage-roundtrip-work/riot-1.20080618/Riot/RiotMain.hs
./hackage-roundtrip-work/scion-0.1.0.2/lib/Scion/Session.hs
./hackage-roundtrip-work/retrie-1.2.3/Retrie/PatternMap/Instances.hs
./hackage-roundtrip-work/relude-1.2.1.0/src/Relude/Debug.hs
./hackage-roundtrip-work/simpleprelude-1.0.1.3/src-exec/Common.hs
./hackage-roundtrip-work/streamly-0.10.1/benchmark/Streamly/Benchmark/Data/Stream/Generate.hs
./hackage-roundtrip-work/streamly-0.10.1/benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hs
./hackage-roundtrip-work/streamly-0.10.1/benchmark/Streamly/Benchmark/Prelude/Merge.hs
./hackage-roundtrip-work/streamly-0.10.1/benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs
./hackage-roundtrip-work/streamly-0.10.1/benchmark/Streamly/Benchmark/Data/Stream/Expand.hs
./hackage-roundtrip-work/syntactic-3.8.4/src/Language/Syntactic/TH.hs
./hackage-roundtrip-work/tamarin-prover-term-0.8.5.1/src/Term/LTerm.hs
./hackage-roundtrip-work/th-desugar-1.16/Test/Run.hs
./hackage-roundtrip-work/toysolver-0.8.1/src/ToySolver/Version.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Sms.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Record.hs
./hackage-roundtrip-work/turtle-1.6.2/test/system-filepath.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Say.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Play.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Gather.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Pause.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Reject.hs
./hackage-roundtrip-work/type-of-html-1.6.2.0/bench/Alloc.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Message.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/End.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Leave.hs
./hackage-roundtrip-work/tensorflow-opgen-0.2.0.1/src/TensorFlow/OpGen.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Hangup.hs
./hackage-roundtrip-work/th-deepstrict-0.1.1.0/test/Language/Haskell/TH/DeepStrict/Golden.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Dial.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Redirect.hs
./hackage-roundtrip-work/twiml-0.2.1.0/src/Text/XML/Twiml/Verbs/Enqueue.hs
./hackage-roundtrip-work/uhc-util-0.1.7.0/src/UHC/Util/Utils.hs
./hackage-roundtrip-work/unagi-chan-0.4.1.4/src/Control/Concurrent/Chan/Unagi/Bounded/Internal.hs
./hackage-roundtrip-work/unagi-bloomfilter-0.1.1.2/src/Control/Concurrent/BloomFilter/Internal.hs
./hackage-roundtrip-work/vinyl-0.14.3/Data/Vinyl/Syntax.hs
./hackage-roundtrip-work/vector-bytestring-0.0.0.1/Data/Vector/Storable/ByteString/Char8.hs
./hackage-roundtrip-work/warp-3.4.0/Network/Wai/Handler/Warp/Types.hs
./hackage-roundtrip-work/wai-devel-0.0.0.4/src/Devel/Watch.hs
./hackage-roundtrip-work/willow-0.1.0.0/test/Test/Willow/WebPlatformTests/Manual/Encoding.hs
./hackage-roundtrip-work/yesod-goodies-0.0.5/Yesod/Goodies/Markdown.hs
10 changes: 2 additions & 8 deletions tests/Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,6 @@ mkTests = do
-- roundTripMakeDeltaTests
]

-- Tests that are no longer needed
-- , noAnnotationTests
-- ,
-- prettyRoundTripTests
-- ,

failingTests :: LibDir -> Test
failingTests libdir = testList "Failing tests"
[
Expand Down Expand Up @@ -205,8 +199,8 @@ tt' = do

-- mkParserTest libdir "ghc910" "LinearLet.hs"
-- mkParserTest libdir "ghc910" "Generic.hs"
mkParserTest libdir "ghc910" "MonoBacktrackPrio.hs"
-- mkParserTestMD libdir "ghc710" "AnnotationNoListTuplePuns.hs"
-- mkParserTest libdir "ghc910" "Expression.hs"
mkParserTest libdir "ghc910" "GenerateBug.hs"

-- Needs GHC changes

Expand Down
5 changes: 5 additions & 0 deletions tests/examples/ghc910/ByHand.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module ByHand where

instance SDecide Nat where
SZero %~ (SSucc _) = Disproved (\case)

11 changes: 11 additions & 0 deletions tests/examples/ghc910/Domino.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{-# LANGUAGE PatternSynonyms #-}
module Domino where

-- c0
pattern (:|) ::
-- c1
a ->
-- c2
a ->
-- c3
Domino a
9 changes: 9 additions & 0 deletions tests/examples/ghc910/ErrorSpec.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module ErrorSpec where

type ErrorChoiceApi
= "path0" :> Get '[JSON] Int -- c0
:<|> "path4" :> (ReqBody '[PlainText] Int :> Post '[PlainText] Int -- c4
:<|> ReqBody '[PlainText] Int :> Post '[JSON] Int) -- c5
:<|> "path5" :> (ReqBody '[JSON] Int :> Post '[PlainText] Int -- c6
:<|> ReqBody '[PlainText] Int :> Post '[PlainText] Int) -- c7

4 changes: 2 additions & 2 deletions tests/examples/ghc910/Expression.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Expression where

eh1 = try (do spaces; char '('; spaces; r <- parseEinh ; spaces; char ')'; return r;) <|> (do
return $ Dims $ Map.singleton n i)
eh1 = try (do return r;) <|> (do
return r)
Loading

0 comments on commit ccccc48

Please sign in to comment.