testsuite/tests/cabal/t18567/all.T

@@ -6,6 +6,7 @@ else:
 test('T18567',
      [ extra_files(['Setup.hs', 'sublib/', 'sublib-unused', 'src/', 'internal-lib.cabal'])
      , js_broken(22356)
+     , normalise_version('internal-lib')
      ],
      run_command,
      ['$MAKE -s --no-print-directory T18567 ' + cleanup])

testsuite/tests/codeGen/should_fail/all.T

@@ -24,4 +24,3 @@ check_bounds_test('CheckBoundsCompareByteArray2') # Check first byte, 1st array
 check_bounds_test('CheckBoundsCompareByteArray3') # Check negative length
 check_bounds_test('CheckOverlapCopyByteArray')
 check_bounds_test('CheckOverlapCopyAddrToByteArray')
-

testsuite/tests/codeGen/should_run/all.T

@@ -229,4 +229,4 @@ test('T20640b', normal, compile_and_run, [''])
 test('T22296',[only_ways(llvm_ways)
               ,unless(arch('x86_64'), skip)],compile_and_run,[''])
 test('T22798', normal, compile_and_run, ['-fregs-graph'])
-test('CheckBoundsOK', js_broken(23123), compile_and_run, ['-fcheck-prim-bounds'])
+test('CheckBoundsOK', normal, compile_and_run, ['-fcheck-prim-bounds'])

testsuite/tests/driver/T16318/Makefile

@@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk
 test_pe = test-package-environment
 
 T16318:
-	"$(GHC_PKG)" latest base >  $(test_pe)
+	"$(GHC_PKG)" field base id --simple-output >  $(test_pe)
 	"$(TEST_HC)" $(TEST_HC_OPTS) -v1 -ignore-dot-ghci -package-env $(test_pe) -e "putStrLn \"Hello\"" > out 2>&1
 	C=`cat out | grep "Loaded package environment" -c` ; \
 	if [ $$C != "1" ]; then false; fi

testsuite/tests/driver/T18125/Makefile

@@ -6,8 +6,8 @@ test_pe = test-package-environment
 test_lib = containers
 
 T18125:
-	"$(GHC_PKG)" latest base >  $(test_pe)
-	"$(GHC_PKG)" latest $(test_lib) >> $(test_pe)
+	"$(GHC_PKG)" field base id --simple-output >  $(test_pe)
+	"$(GHC_PKG)" field $(test_lib) id --simple-outpu >> $(test_pe)
 	"$(TEST_HC)" $(TEST_HC_OPTS) -Wunused-packages -package-env $(test_pe) T18125.hs > out 2>&1
 	C=`cat out | grep "$(test_lib)" -c` ; \
 	if [ $$C != "1" ]; then false; fi

testsuite/tests/driver/j-space/jspace.hs

@@ -2,6 +2,7 @@ module Main where
 
 import GHC
 import GHC.Driver.Monad
+import GHC.Driver.Session
 import System.Environment
 import GHC.Driver.Env.Types
 import GHC.Profiling
@@ -25,6 +26,9 @@ initGhcM xs = do
     let cmdOpts = ["-fforce-recomp"] ++ xs
     (df2, leftovers, _) <- parseDynamicFlags (hsc_logger session) df1 (map noLoc cmdOpts)
     setSessionDynFlags df2
+    ghcUnitId <- case lookup "Project Unit Id" (compilerInfo df2) of
+                    Nothing -> fail "failed to find ghc's unit-id in the compiler info"
+                    Just ghcUnitId -> pure ghcUnitId
     ts <- mapM (\s -> guessTarget s Nothing Nothing) $ map unLoc leftovers
     setTargets ts
     _ <- load LoadAllTargets
@@ -36,7 +40,7 @@ initGhcM xs = do
     liftIO $ do
       requestHeapCensus
       performGC
-      [ys] <- filter (isPrefixOf "ghc:GHC.Unit.Module.ModDetails.ModDetails") . lines <$> readFile "jspace.hp"
+      [ys] <- filter (isPrefixOf (ghcUnitId <> ":GHC.Unit.Module.ModDetails.ModDetails")) . lines <$> readFile "jspace.hp"
       let (n :: Int) = read (last (words ys))
       -- The output should be 50 * 8 * word_size (i.e. 3200, or 1600 on 32-bit architectures):
       -- the test contains DEPTH + WIDTH + 2 = 50 modules J, H_0, .., H_DEPTH, W_1, .., W_WIDTH,

testsuite/tests/ghci/scripts/Makefile

@@ -69,4 +69,4 @@ T12023:
 
 .PHONY: T19650_setup
 T19650_setup:
-	'$(GHC_PKG)' latest base > my_package_env
+	'$(GHC_PKG)' field base id --simple-output > my_package_env

testsuite/tests/package/all.T

@@ -19,4 +19,4 @@ test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M,
 test('package10',  normal, compile,      ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" '])
 
 test('T4806', normalise_version('containers'), compile_fail, ['-ignore-package containers'])
-test('T4806a', normalise_version('deepseq', 'containers'), compile_fail, ['-ignore-package deepseq'])
+test('T4806a', normalise_version('deepseq', 'containers', 'template-haskell'), compile_fail, ['-ignore-package deepseq'])

utils/count-deps/Main.hs

@@ -56,25 +56,28 @@ calcDeps modName libdir =
         logger <- getLogger
         (df, _, _) <- parseDynamicFlags logger df [noLoc "-package=ghc"]
         setSessionDynFlags df
-        env <- getSession
-        loop env Map.empty [mkModuleName modName]
+        case lookup "Project Unit Id" (compilerInfo df) of
+          Nothing -> fail "failed to find ghc's unit-id in the compiler info"
+          Just ghcUnitId -> do
+            env <- getSession
+            loop ghcUnitId env Map.empty [mkModuleName modName]
   where
     -- Source imports are only guaranteed to show up in the 'mi_deps'
     -- of modules that import them directly and don’t propagate
     -- transitively so we loop.
-    loop :: HscEnv -> Map.Map ModuleName [ModuleName] -> [ModuleName] -> Ghc (Map.Map ModuleName [ModuleName])
-    loop env modules (m : ms) =
+    loop :: String -> HscEnv -> Map.Map ModuleName [ModuleName] -> [ModuleName] -> Ghc (Map.Map ModuleName [ModuleName])
+    loop ghcUnitId env modules (m : ms) =
       if m `Map.member` modules
-        then loop env modules ms
+        then loop ghcUnitId env modules ms
         else do
-          mi <- liftIO $ hscGetModuleInterface env (mkModule m)
+          mi <- liftIO $ hscGetModuleInterface env (mkModule ghcUnitId m)
           let deps = modDeps mi
           modules <- return $ Map.insert m [] modules
-          loop env (Map.insert m deps modules) $ ms ++ filter (not . (`Map.member` modules)) deps
-    loop _ modules [] = return modules
+          loop ghcUnitId env (Map.insert m deps modules) $ ms ++ filter (not . (`Map.member` modules)) deps
+    loop _ _ modules [] = return modules
 
-    mkModule :: ModuleName -> Module
-    mkModule = Module (stringToUnit "ghc")
+    mkModule :: String -> ModuleName -> Module
+    mkModule ghcUnitId = Module (stringToUnit ghcUnitId)
 
     modDeps :: ModIface -> [ModuleName]
     modDeps mi = map (gwib_mod . snd) $ Set.toList $ dep_direct_mods (mi_deps mi)

utils/ghc-pkg/Main.hs

@@ -23,6 +23,7 @@
 
 module Main (main) where
 
+import Debug.Trace
 import qualified GHC.Unit.Database as GhcPkg
 import GHC.Unit.Database hiding (mkMungePathUrl)
 import GHC.HandleEncoding
@@ -1600,7 +1601,7 @@ listPackages verbosity my_flags mPackageName mModuleName = do
 simplePackageList :: [Flag] -> [InstalledPackageInfo] -> IO ()
 simplePackageList my_flags pkgs = do
    let showPkg :: InstalledPackageInfo -> String
-       showPkg | FlagShowUnitIds `elem` my_flags = display . installedUnitId
+       showPkg | FlagShowUnitIds `elem` my_flags = traceId . display . installedUnitId
                | FlagNamesOnly `elem` my_flags   = display . mungedName . mungedId
                | otherwise                       = display . mungedId
        strs = map showPkg pkgs