GitLab

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:

a3b431f3

by David Eichmann at 2026-06-04T10:10:19+00:00

Hadrian: convert env variable ACLOCAL_PATH to unix paths.

Convert ACLOCAL_PATH to a unix style path when invoking autoreconf.
Autoreconf doesn't handle windows paths.
See Note [Autoreconf unix paths from ACLOCAL_PATH].

Fixes #27311

fcfa0834

by Simon Jakobi at 2026-06-04T16:19:21-04:00

testsuite: Deduplicate --only test names

config.only is assumed to be a set, but supplying --only overwrote it
with the (list) argparse result, which can contain duplicates. When a
test ran, config.only.remove(name) dropped only the first occurrence,
so a duplicated name lingered and was later misreported as a
"test not found" framework failure. Store it as a set instead.

Fixes #27322

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

4 changed files:

boot
hadrian/src/Hadrian/Oracles/Path.hs
hadrian/src/Rules/BinaryDist.hs
testsuite/driver/runtests.py

Changes:

boot

@@ -52,9 +52,8 @@ def autoreconf():
      # Run autoreconf on everything that needs it.
      processes = {}
      if os.name == 'nt':
 -        # Get the normalized ACLOCAL_PATH for Windows
 -        # This is necessary since on Windows this will be a Windows
 -        # path, which autoreconf doesn't know doesn't know how to handle.
 +        # Convert ACLOCAL_PATH env variable to unix style paths on Windows
 +        # See Note [Autoreconf unix paths from ACLOCAL_PATH]
          ac_local = os.getenv('ACLOCAL_PATH', '')
          ac_local_arg = re.sub(r';', r':', ac_local)
          ac_local_arg = re.sub(r'\\', r'/', ac_local_arg)

hadrian/src/Hadrian/Oracles/Path.hs

  {-# LANGUAGE TypeFamilies #-}
  module Hadrian.Oracles.Path (
 -    lookupInPath, fixAbsolutePathOnWindows, pathOracle
 +    lookupInPath, fixAbsolutePathOnWindows, fixUnixPathsOnWindows,
 +    pathOracle
      ) where
  import Control.Monad
@@ -33,6 +34,14 @@ fixAbsolutePathOnWindows path =
      else
          return path
 +-- | Fix a unix path list on Windows:
 +-- * "C:\\foo\\bar;C:\\msys2\\bin" => "/c/foo/bar:/c/msys2/bin"
 +fixUnixPathsOnWindows :: FilePath -> Action FilePath
 +fixUnixPathsOnWindows paths =
 +    if isWindows
 +    then askOracle $ UnixPathList paths
 +    else return paths
++
  newtype LookupInPath = LookupInPath String
      deriving (Binary, Eq, Hashable, NFData, Show)
  type instance RuleResult LookupInPath = String
@@ -41,6 +50,10 @@ newtype WindowsPath = WindowsPath FilePath
      deriving (Binary, Eq, Hashable, NFData, Show)
  type instance RuleResult WindowsPath = String
 +newtype UnixPathList = UnixPathList FilePath
 +    deriving (Binary, Eq, Hashable, NFData, Show)
 +type instance RuleResult UnixPathList = String
++
  -- | Oracles for looking up paths. These are slow and require caching.
  pathOracle :: Rules ()
  pathOracle = do
@@ -50,6 +63,12 @@ pathOracle = do
          putVerbose $ "| Windows path mapping: " ++ path ++ " => " ++ windowsPath
          return windowsPath
 +    void $ addOracleCache $ \(UnixPathList paths) -> do
 +        Stdout out <- quietly $ cmd ["cygpath", "-p", "-u", paths]
 +        let unixPaths = unifyPath $ dropWhileEnd isSpace out
 +        putVerbose $ "| Unix path mapping: " ++ paths ++ " => " ++ unixPaths
 +        return unixPaths
++
      void $ addOracleCache $ \(LookupInPath name) -> do
          path <- liftIO getSearchPath
          exes <- liftIO (findExecutablesInDirectories path name)

hadrian/src/Rules/BinaryDist.hs

@@ -3,18 +3,19 @@ module Rules.BinaryDist where
  import CommandLine
  import Context
 +import Data.Either
 +import qualified Data.Set as Set
  import Expression
 +import Hadrian.Oracles.Path (fixUnixPathsOnWindows)
 +import Oracles.Flavour
  import Oracles.Setting
  import Packages
 +import Rules.Generate (generateSettings)
  import Settings
 +import qualified System.Directory.Extra as IO
  import Settings.Program (programContext)
  import Target
  import Utilities
 -import qualified System.Directory.Extra as IO
 -import Data.Either
 -import qualified Data.Set as Set
 -import Oracles.Flavour
 -import Rules.Generate (generateSettings)
  {-
  Note [Binary distributions]
@@ -343,7 +344,25 @@ bindistRules = do
          ghcRoot <- topDirectory
          copyFile (ghcRoot -/- "aclocal.m4") (ghcRoot -/- "distrib" -/- "aclocal.m4")
          copyDirectory (ghcRoot -/- "m4") (ghcRoot -/- "distrib")
 -        buildWithCmdOptions [] $
++
 +        -- Note [Autoreconf unix paths from ACLOCAL_PATH]
 +        -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +        -- On Windows, autoreconf fails when the ACLOCAL_PATH env variable contains Windows-
 +        -- style paths. This happens because MSYS2 automatically converts env variables to
 +        -- Windows-style paths. To fix this, we convert ACLOCAL_PATH back to Unix style.
 +        -- This is done both in the boot Python script and here when building a bindist.
 +        win_host <- isWinHost
 +        env <- if not win_host
 +          then pure []
 +          else do
 +            aclocalPathMay <- getEnv "ACLOCAL_PATH"
 +            case aclocalPathMay of
 +              Nothing -> pure []
 +              Just aclocalPath -> do
 +                unixAclocalPath <- fixUnixPathsOnWindows aclocalPath
 +                pure [AddEnv "ACLOCAL_PATH" unixAclocalPath]
++
 +        buildWithCmdOptions env $
              target (vanillaContext Stage1 ghc) (Autoreconf $ ghcRoot -/- "distrib") [] []
          -- We clean after ourselves, moving the configure script we generated in
          -- our bindist dir

testsuite/driver/runtests.py

@@ -133,7 +133,7 @@ if args.unexpected_output_dir:
      config.unexpected_output_dir = Path(args.unexpected_output_dir)
  if args.only:
 -    config.only = args.only
 +    config.only = set(args.only)
      config.run_only_some_tests = True
  if args.skip: