Confirm original tests still pass

Author: alanz

configure.sh

@@ -271,4 +271,4 @@ rm -fr dist*
 # cabal configure -fdev  --with-compiler=/opt/ghc/9.13.20250316/bin/ghc --allow-newer
 # cabal configure -fdev  -froundtrip --enable-tests --with-compiler=/opt/ghc/9.13.20250316/bin/ghc --allow-newer
 # cabal configure -fdev  -froundtrip --enable-tests --with-compiler=/opt/ghc/9.13.20250331/bin/ghc --allow-newer
-cabal configure -fdev  -froundtrip --enable-tests --with-compiler=/opt/ghc/9.13.20250524/bin/ghc --allow-newer
+cabal configure -fdev  -froundtrip --enable-tests --with-compiler=/opt/ghc/9.13.20250604/bin/ghc --allow-newer

src/Language/Haskell/GHC/ExactPrint/Parsers.hs

@@ -124,8 +124,8 @@ runParser parser flags filename str = GHC.unP parser parseState
       -- parseState = GHC.initParserState (GHC.initParserOpts flags) buffer location
       -- parseState = GHC.initParserStateWithMacros flags Nothing (GHC.initParserOpts flags) buffer location
 
-      -- macros = fromMaybe Map.empty macrosFromIORef
-      macros = fromMaybe (error "macroIORef not set up") macrosFromIORef
+      macros = fromMaybe Map.empty macrosFromIORef
+      -- macros = fromMaybe (error "macroIORef not set up") macrosFromIORef
 
       -- opts0 = GHC.initParserOpts flags
       -- opts1 = GHC.enableExtBit GHC.UsePosPragsBit opts0
@@ -528,7 +528,8 @@ myGetPragState :: GHC.DynFlags -> GHC.UnitEnv -> GHC.ParserOpts -> FilePath -> H
 myGetPragState df unit_env popts filename handle = do
   buf <- GHC.hGetStringBufferBlock handle blockSize
 
-  let macros = fromMaybe (error "macroIORef not set up") macrosFromIORef
+  let macros = fromMaybe Map.empty macrosFromIORef
+  -- let macros = fromMaybe (error "macroIORef not set up") macrosFromIORef
 
       -- opts0 = GHC.initParserOpts flags
       -- opts1 = GHC.enableExtBit GHC.UsePosPragsBit opts0

tests/Test.hs

@@ -46,8 +46,8 @@ testDirs :: [FilePath]
 testDirs =
   case ghcVersion of
     GHC910 -> ["pre-ghc910", "ghc910"]
-    -- GHC912 -> ["pre-ghc910", "ghc910", "ghc912"]
-    GHC912 -> ["ghc-cpp"]
+    GHC912 -> ["pre-ghc910", "ghc910", "ghc912"]
+    -- GHC912 -> ["ghc-cpp"]
     -- GHC912  -> ["ghc912"]
     -- GHC912  -> ["ghc912-copied"]
     -- GHC912  -> ["ghc912",  "ghc912-copied"]
@@ -196,7 +196,7 @@ tr = hSilence [stderr] $ do
 tt' :: IO (Counts,Int)
 tt' = do
   let libdir = GHC.Paths.libdir
-  presetHackageVersionMacros libdir
+  -- presetHackageVersionMacros libdir
   runTestText (putTextToHandle stdout True) $ TestList [
 
     -- mkParserTest libdir "ghc98" "ModuleComments1.hs"
@@ -230,14 +230,15 @@ tt' = do
     -- mkParserTest libdir "pre-ghc910" "ExperimIOP.hs"
     -- mkParserTest libdir "pre-ghc910" "RandomPGC1.hs"
     -- mkParserTest libdir "pre-ghc910" "Utils.hs"
+    mkParserTest libdir "pre-ghc910" "A.hs"
     -- mkParserTest libdir "failing" "CppComment.hs"
     -- mkParserTest libdir "ghc-cpp" "Scan.hs"
     -- mkParserTest libdir "ghc-cpp" "Test1.hs"
     -- mkParserTest libdir "ghc-cpp" "WithoutSomeFixpoints.hs"
 
     -- mkParserTest libdir "ghc-cpp" "Promise.hs"
     -- mkParserTest libdir "ghc-cpp" "Set1.hs"
-    mkParserTest libdir "ghc-cpp" "Compat.hs"
+    -- mkParserTest libdir "ghc-cpp" "Compat.hs"
 
     ]
 

tests/Test/Common.hs

@@ -70,8 +70,8 @@ import System.FilePath
 import qualified GHC.Paths
 
 useGhcCpp :: Bool
-useGhcCpp = True
--- useGhcCpp = False
+-- useGhcCpp = True
+useGhcCpp = False
 
 testPrefix :: FilePath
 testPrefix = "." </> "tests" </> "examples"