Checking operation with GHC 9.10.1 released version

All looking good so far
alanz · May 12, 2024 · f2c87cc · f2c87cc
1 parent 8145a88
commit f2c87cc
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,4 @@ packages
 /failing-tests-for-ghc.txt
 /failing-tests-for-ghc9.2.txt
 /failures.txt
+/tests/examples/ghc910-copied/
diff --git a/cabal.project b/cabal.project
@@ -5,15 +5,15 @@ packages: .
 --     location: https://github.com/mitchellwrosen/fork--unix-compat.git
 --     tag:  f28060acd449643d267954647c1bb7c748c35fa9
 
-repository head.hackage.ghc.haskell.org
-   url: https://ghc.gitlab.haskell.org/head.hackage/
-   secure: True
-   key-threshold: 3
-   root-keys:
-       f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-       7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-       26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
+-- repository head.hackage.ghc.haskell.org
+--    url: https://ghc.gitlab.haskell.org/head.hackage/
+--    secure: True
+--    key-threshold: 3
+--    root-keys:
+--        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
+--        7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
+--        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
+-- active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
 
 -- optional-packages: packages/*/*.cabal
 
@@ -24,8 +24,8 @@ active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
 -- $ cp ${WhereThisGitHubRepoIsCloned}/patches/$PKGID.cabal ./*.cabal
 -- $ cd ../..
 
-allow-newer:
-         ghc-paths:Cabal
+-- allow-newer:
+--          ghc-paths:Cabal
 
 package ghc-exactprint
   test-show-details: direct

diff --git a/configure.sh b/configure.sh
@@ -235,4 +235,9 @@ cabal configure -fdev -froundtrip --enable-tests --with-compiler=/opt/ghc/9.10.0
 #--------------------------------------------------------------------
 #- GHC 9.10.1
 
-cabal configure -fdev -froundtrip --enable-tests --with-compiler=/opt/ghc/9.10.1/bin/ghc --allow-newer
+# roundtrip usage
+# cabal configure -fdev -froundtrip --enable-tests --with-compiler=/opt/ghc/9.10.1/bin/ghc --allow-newer
+
+# Check final state
+cabal configure -fdev  --enable-tests --with-compiler=/opt/ghc/9.10.1/bin/ghc
+
diff --git a/tests/Test.hs b/tests/Test.hs
@@ -43,8 +43,8 @@ ghcVersion = GHC98
 testDirs :: [FilePath]
 testDirs =
   case ghcVersion of
-    GHC98  -> ["ghc710", "ghc80", "ghc82", "ghc84", "ghc86", "ghc88", "ghc810", "ghc90", "ghc92", "ghc94", "ghc96"]
-    GHC910 -> ["ghc710", "ghc80", "ghc82", "ghc84", "ghc86", "ghc88", "ghc810", "ghc90", "ghc92", "ghc94", "ghc96", "ghc98"]
+    GHC910 -> ["ghc710", "ghc80", "ghc82", "ghc84", "ghc86", "ghc88", "ghc810",
+               "ghc90", "ghc92", "ghc94", "ghc96", "ghc98", "ghc910"]
     -- GHC910  -> ["ghc910"]
     -- GHC910  -> ["ghc910-copied"]
     -- GHC910  -> ["ghc910",  "ghc910-copied"]
@@ -138,17 +138,17 @@ mkTests = do
   roundTripTests <- findTests libdir
   roundTripBalanceCommentsTests <- findTestsBC libdir
   roundTripMakeDeltaTests <- findTestsMD libdir
-  -- prettyRoundTripTests <- findPrettyTests libdir
   return $ TestList [
-                      internalTests,
-                      roundTripTests
-                   ,
-                     (transformTests libdir)
-                   , (failingTests libdir)
-                   ,
-                     roundTripBalanceCommentsTests
-                   ,
-                     roundTripMakeDeltaTests
+                      -- internalTests,
+                   --    roundTripTests
+                   -- ,
+                   --   (transformTests libdir)
+                   -- ,
+                      (failingTests libdir)
+                   -- ,
+                   --   roundTripBalanceCommentsTests
+                   -- ,
+                   --   roundTripMakeDeltaTests
                     ]
 
 failingTests :: LibDir -> Test
@@ -158,6 +158,8 @@ failingTests libdir = testList "Failing tests"
 
   -- We do not capture EOF location very well any more
     mkTestModBad libdir "T10970a.hs"
+  -- Injecting CPP comments adjacent to existing ones is a problem
+  , mkTestModBad libdir "CppComment.hs"
   ]
 
 

diff --git a/tests/examples/Arrow2.hs b/tests/examples/Arrow2.hs
diff --git a/tests/examples/ghc910/CppComment.hs → tests/examples/failing/CppComment.hs b/tests/examples/ghc910/CppComment.hs → tests/examples/failing/CppComment.hs
diff --git a/tests/examples/failing/CppComment.hs.bad b/tests/examples/failing/CppComment.hs.bad
@@ -0,0 +1,9 @@
+{-# LANGUAGE CPP #-}
+module CppComment where
+
+trace_options =
+
+#if 0
+    x
+#endif
+    y
diff --git a/tests/examples/ghc910/Class.hs b/tests/examples/ghc910/Class.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+module Distribution.Compat.Binary.Class where
+
+x = 1
+
+-- c1
+
+#if 1
+
+y = 1
+#endif
+