testsuite changeswip/multi-hmi-split

87 files changed, 415 insertions, 288 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index efeaa94b89..501ac17b7b 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1321,46 +1321,53 @@ def ghci_script( name, way, script):
 # Compile-only tests
 
 def compile( name, way, extra_hc_opts ):
-    return do_compile( name, way, False, None, [], extra_hc_opts )
+    return do_compile( name, way, False, None, [],  [], extra_hc_opts )
 
 def compile_fail( name, way, extra_hc_opts ):
-    return do_compile( name, way, True, None, [], extra_hc_opts )
+    return do_compile( name, way, True, None, [], [], extra_hc_opts )
 
 def backpack_typecheck( name, way, extra_hc_opts ):
-    return do_compile( name, way, False, None, [], "-fno-code -fwrite-interface " + extra_hc_opts, backpack=True )
+    return do_compile( name, way, False, None, [], [], "-fno-code -fwrite-interface " + extra_hc_opts, backpack=True )
 
 def backpack_typecheck_fail( name, way, extra_hc_opts ):
-    return do_compile( name, way, True, None, [], "-fno-code -fwrite-interface " + extra_hc_opts, backpack=True )
+    return do_compile( name, way, True, None, [], [], "-fno-code -fwrite-interface " + extra_hc_opts, backpack=True )
 
 def backpack_compile( name, way, extra_hc_opts ):
-    return do_compile( name, way, False, None, [], extra_hc_opts, backpack=True )
+    return do_compile( name, way, False, None, [], [], extra_hc_opts, backpack=True )
 
 def backpack_compile_fail( name, way, extra_hc_opts ):
-    return do_compile( name, way, True, None, [], extra_hc_opts, backpack=True )
+    return do_compile( name, way, True, None, [], [], extra_hc_opts, backpack=True )
 
 def backpack_run( name, way, extra_hc_opts ):
     return compile_and_run__( name, way, None, [], extra_hc_opts, backpack=True )
 
 def multimod_compile( name, way, top_mod, extra_hc_opts ):
-    return do_compile( name, way, False, top_mod, [], extra_hc_opts )
+    return do_compile( name, way, False, top_mod, [], [], extra_hc_opts )
 
 def multimod_compile_fail( name, way, top_mod, extra_hc_opts ):
-    return do_compile( name, way, True, top_mod, [], extra_hc_opts )
+    return do_compile( name, way, True, top_mod, [], [], extra_hc_opts )
 
 def multimod_compile_filter( name, way, top_mod, extra_hc_opts, filter_with, suppress_stdout=True ):
-    return do_compile( name, way, False, top_mod, [], extra_hc_opts, filter_with=filter_with, suppress_stdout=suppress_stdout )
+    return do_compile( name, way, False, top_mod, [], [], extra_hc_opts, filter_with=filter_with, suppress_stdout=suppress_stdout )
+
+def multiunit_compile( name, way, units, extra_hc_opts ):
+    return do_compile( name, way, False, None, [], units, extra_hc_opts )
+
+def multiunit_compile_fail( name, way, units, extra_hc_opts ):
+    return do_compile( name, way, True, None, [], units, extra_hc_opts )
 
 def multi_compile( name, way, top_mod, extra_mods, extra_hc_opts ):
-    return do_compile( name, way, False, top_mod, extra_mods, extra_hc_opts)
+    return do_compile( name, way, False, top_mod, extra_mods, [], extra_hc_opts)
 
 def multi_compile_fail( name, way, top_mod, extra_mods, extra_hc_opts ):
-    return do_compile( name, way, True, top_mod, extra_mods, extra_hc_opts)
+    return do_compile( name, way, True, top_mod, extra_mods, [], extra_hc_opts)
 
 def do_compile(name: TestName,
                way: WayName,
                should_fail: bool,
                top_mod: Optional[Path],
                extra_mods: List[str],
+               units: List[str],
                extra_hc_opts: str,
                **kwargs
                ) -> PassFail:
@@ -1371,7 +1378,7 @@ def do_compile(name: TestName,
        return result
     extra_hc_opts = result.hc_opts
 
-    result = simple_build(name, way, extra_hc_opts, should_fail, top_mod, False, True, **kwargs)
+    result = simple_build(name, way, extra_hc_opts, should_fail, top_mod, units, False, True, **kwargs)
 
     if badResult(result):
         return result
@@ -1406,7 +1413,7 @@ def compile_cmp_asm(name: TestName,
                     extra_hc_opts: str
                     ) -> PassFail:
     print('Compile only, extra args = ', extra_hc_opts)
-    result = simple_build(name + '.' + ext, way, '-keep-s-files -O ' + extra_hc_opts, False, None, False, False)
+    result = simple_build(name + '.' + ext, way, '-keep-s-files -O ' + extra_hc_opts, False, None, [], False, False)
 
     if badResult(result):
         return result
@@ -1433,7 +1440,7 @@ def compile_grep_asm(name: TestName,
                      extra_hc_opts: str
                      ) -> PassFail:
     print('Compile only, extra args = ', extra_hc_opts)
-    result = simple_build(name + '.' + ext, way, '-keep-s-files -O ' + extra_hc_opts, False, None, False, False)
+    result = simple_build(name + '.' + ext, way, '-keep-s-files -O ' + extra_hc_opts, False, None, [], False, False)
 
     if badResult(result):
         return result
@@ -1454,7 +1461,7 @@ def compile_grep_core(name: TestName,
                       extra_hc_opts: str
                       ) -> PassFail:
     print('Compile only, extra args = ', extra_hc_opts)
-    result = simple_build(name + '.hs', way, '-ddump-to-file -dsuppress-all -ddump-simpl -O ' + extra_hc_opts, False, None, False, False)
+    result = simple_build(name + '.hs', way, '-ddump-to-file -dsuppress-all -ddump-simpl -O ' + extra_hc_opts, False, None, [], False, False)
 
     if badResult(result):
         return result
@@ -1490,7 +1497,7 @@ def compile_and_run__(name: TestName,
     if way.startswith('ghci'): # interpreted...
         return interpreter_run(name, way, extra_hc_opts, top_mod)
     else: # compiled...
-        result = simple_build(name, way, extra_hc_opts, False, top_mod, True, True, backpack = backpack)
+        result = simple_build(name, way, extra_hc_opts, False, top_mod, [], True, True, backpack = backpack)
         if badResult(result):
             return result
 
@@ -1600,7 +1607,7 @@ def check_stats(name: TestName,
 
 def extras_build( way, extra_mods, extra_hc_opts ):
     for mod, opts in extra_mods:
-        result = simple_build(mod, way, opts + ' ' + extra_hc_opts, False, None, False, False)
+        result = simple_build(mod, way, opts + ' ' + extra_hc_opts, False, None, [], False, False)
         if not (mod.endswith('.hs') or mod.endswith('.lhs')):
             extra_hc_opts += ' %s' % Path(mod).with_suffix('.o')
         if badResult(result):
@@ -1613,6 +1620,7 @@ def simple_build(name: Union[TestName, str],
                  extra_hc_opts: str,
                  should_fail: bool,
                  top_mod: Optional[Path],
+                 units: List[str],
                  link: bool,
                  addsuf: bool,
                  backpack: bool = False,
@@ -1646,6 +1654,10 @@ def simple_build(name: Union[TestName, str],
         to_do = to_do + '--backpack '
     elif link:
         to_do = '-o ' + name
+    elif len(units) > 0:
+        to_do = '--make'
+        for u in units:
+            to_do = to_do + ' -unit @%s' % u
     else:
         to_do = '-c' # just compile
 
diff --git a/testsuite/tests/backpack/should_compile/bkp40.bkp b/testsuite/tests/backpack/should_compile/bkp40.bkp
index d149d75877..749cfa5f92 100644
--- a/testsuite/tests/backpack/should_compile/bkp40.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp40.bkp
@@ -36,7 +36,7 @@ unit eqmap where
         -- Need to insert redundant constraint to make it work...
         insert :: Eq k => k -> a -> Map k a -> Map k a
         insert k v (Assoc xs) = Assoc ((k,v):xs)
-unit main where
+unit top where
     dependency user[Map=ordmap:Map] (User as User.Ord)
     dependency user[Map=eqmap:Map] (User as User.Eq)
 
diff --git a/testsuite/tests/backpack/should_compile/bkp40.stderr b/testsuite/tests/backpack/should_compile/bkp40.stderr
index f250951578..56216c5f3e 100644
--- a/testsuite/tests/backpack/should_compile/bkp40.stderr
+++ b/testsuite/tests/backpack/should_compile/bkp40.stderr
@@ -7,8 +7,8 @@
 [3 of 4] Processing eqmap
   Instantiating eqmap
   [1 of 1] Compiling Map              ( eqmap/Map.hs, bkp40.out/eqmap/Map.o )
-[4 of 4] Processing main
-  Instantiating main
+[4 of 4] Processing top
+  Instantiating top
   [1 of 2] Including user[Map=ordmap:Map]
     Instantiating user[Map=ordmap:Map]
     [1 of 2] Compiling Map[sig]         ( user/Map.hsig, bkp40.out/user/user-GzloW2NeDdA2M0V8qzN4g2/Map.o )
diff --git a/testsuite/tests/backpack/should_compile/bkp41.bkp b/testsuite/tests/backpack/should_compile/bkp41.bkp
index e8b5b24e35..fae5bc81fc 100644
--- a/testsuite/tests/backpack/should_compile/bkp41.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp41.bkp
@@ -14,5 +14,5 @@ unit sig where
         import B
         app = print T
 
-unit main where
+unit top where
     dependency sig[B=impl:B]
diff --git a/testsuite/tests/backpack/should_compile/bkp41.stderr b/testsuite/tests/backpack/should_compile/bkp41.stderr
index 766317718c..1ef9343d38 100644
--- a/testsuite/tests/backpack/should_compile/bkp41.stderr
+++ b/testsuite/tests/backpack/should_compile/bkp41.stderr
@@ -5,8 +5,8 @@
 [2 of 3] Processing sig
   [1 of 2] Compiling B[sig]           ( sig/B.hsig, nothing )
   [2 of 2] Compiling App              ( sig/App.hs, nothing )
-[3 of 3] Processing main
-  Instantiating main
+[3 of 3] Processing top
+  Instantiating top
   [1 of 1] Including sig[B=impl:B]
     Instantiating sig[B=impl:B]
     [1 of 2] Compiling B[sig]           ( sig/B.hsig, bkp41.out/sig/sig-HVnmSw44WZeBfwnUur4wzl/B.o )
diff --git a/testsuite/tests/backpack/should_compile/bkp42.bkp b/testsuite/tests/backpack/should_compile/bkp42.bkp
index 59590f9125..9541738852 100644
--- a/testsuite/tests/backpack/should_compile/bkp42.bkp
+++ b/testsuite/tests/backpack/should_compile/bkp42.bkp
@@ -17,5 +17,5 @@ unit sig where
         app :: T -> IO ()
         app t = print t
 
-unit main where
+unit top where
     dependency sig[B=impl:C]
diff --git a/testsuite/tests/backpack/should_compile/bkp42.stderr b/testsuite/tests/backpack/should_compile/bkp42.stderr
index ae2bb75c51..460a098e18 100644
--- a/testsuite/tests/backpack/should_compile/bkp42.stderr
+++ b/testsuite/tests/backpack/should_compile/bkp42.stderr
@@ -6,8 +6,8 @@
 [2 of 3] Processing sig
   [1 of 2] Compiling B[sig]           ( sig/B.hsig, nothing )
   [2 of 2] Compiling App              ( sig/App.hs, nothing )
-[3 of 3] Processing main
-  Instantiating main
+[3 of 3] Processing top
+  Instantiating top
   [1 of 1] Including sig[B=impl:C]
     Instantiating sig[B=impl:C]
     [1 of 2] Compiling B[sig]           ( sig/B.hsig, bkp42.out/sig/sig-Ko6MwJiRFc509cOdDShPV5/B.o )
diff --git a/testsuite/tests/backpack/should_fail/bkpfail51.stderr b/testsuite/tests/backpack/should_fail/bkpfail51.stderr
index c732e0bcbf..9f40ff1d01 100644
--- a/testsuite/tests/backpack/should_fail/bkpfail51.stderr
+++ b/testsuite/tests/backpack/should_fail/bkpfail51.stderr
@@ -2,7 +2,7 @@
   [1 of 2] Compiling H[sig]           ( p/H.hsig, nothing )
   [2 of 2] Compiling I                ( p/I.hs, nothing )
 [2 of 2] Processing q
-Module imports and instantiations form a cycle:
+Module graph contains a cycle:
         instantiated unit p[H=A]
         imports module ‘A’ (q/A.hsig)
   which imports instantiated unit p[H=A]
diff --git a/testsuite/tests/cabal/T12485/T12485.stdout b/testsuite/tests/cabal/T12485/T12485.stdout
index aefbf389b1..5d24c873ce 100644
--- a/testsuite/tests/cabal/T12485/T12485.stdout
+++ b/testsuite/tests/cabal/T12485/T12485.stdout
@@ -1,6 +1,6 @@
 Reading package info from "a.pkg" ... done.
 Reading package info from "b.pkg" ... done.
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main [Objects changed]
diff --git a/testsuite/tests/cabal/cabal08/cabal08.stdout b/testsuite/tests/cabal/cabal08/cabal08.stdout
index 06a164b150..200f53e482 100644
--- a/testsuite/tests/cabal/cabal08/cabal08.stdout
+++ b/testsuite/tests/cabal/cabal08/cabal08.stdout
@@ -1,12 +1,12 @@
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main
 p2
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main [Objects changed]
 p1
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main [Objects changed]
 p2
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main [Objects changed]
 p1
diff --git a/testsuite/tests/cmm/should_compile/T16930.stdout b/testsuite/tests/cmm/should_compile/T16930.stdout
index bc33620682..ebbb14dcd5 100644
--- a/testsuite/tests/cmm/should_compile/T16930.stdout
+++ b/testsuite/tests/cmm/should_compile/T16930.stdout
@@ -1,6 +1,6 @@
 testing -ddump-cmm-verbose for T16930 ...
-[1 of 1] Compiling Main             ( T16930.hs, T16930.o )
-Linking T16930 ...
+[1 of 2] Compiling Main             ( T16930.hs, T16930.o )
+[2 of 2] Linking T16930
 T16930.dump-cmm-caf
 T16930.dump-cmm-cfg
 T16930.dump-cmm-cps
diff --git a/testsuite/tests/count-deps/CountDepsAst.stdout b/testsuite/tests/count-deps/CountDepsAst.stdout
index b557778846..28f8c3c130 100644
--- a/testsuite/tests/count-deps/CountDepsAst.stdout
+++ b/testsuite/tests/count-deps/CountDepsAst.stdout
@@ -1,4 +1,4 @@
-Found 277 Language.Haskell.Syntax module dependencies
+Found 302 Language.Haskell.Syntax module dependencies
 GHC.Builtin.Names
 GHC.Builtin.PrimOps
 GHC.Builtin.Types
@@ -15,10 +15,15 @@ GHC.Cmm.Dataflow.Label
 GHC.Cmm.Expr
 GHC.Cmm.MachOp
 GHC.Cmm.Node
+GHC.Cmm.Ppr.Expr
 GHC.Cmm.Switch
 GHC.Cmm.Type
+GHC.Cmm.Utils
 GHC.CmmToAsm.CFG.Weight
 GHC.CmmToAsm.Config
+GHC.CmmToAsm.Ppr
+GHC.CmmToLlvm.Base
+GHC.CmmToLlvm.Regs
 GHC.Core
 GHC.Core.Class
 GHC.Core.Coercion
@@ -122,7 +127,18 @@ GHC.Iface.Ext.Fields
 GHC.Iface.Recomp.Binary
 GHC.Iface.Syntax
 GHC.Iface.Type
+GHC.Linker.Dynamic
+GHC.Linker.ExtraObj
+GHC.Linker.MacOS
+GHC.Linker.Static
 GHC.Linker.Types
+GHC.Linker.Unit
+GHC.Linker.Windows
+GHC.Llvm
+GHC.Llvm.MetaData
+GHC.Llvm.Ppr
+GHC.Llvm.Syntax
+GHC.Llvm.Types
 GHC.Parser.Annotation
 GHC.Parser.Errors.Basic
 GHC.Parser.Errors.Ppr
@@ -148,13 +164,21 @@ GHC.Prelude
 GHC.Runtime.Context
 GHC.Runtime.Eval.Types
 GHC.Runtime.Heap.Layout
+GHC.Runtime.Interpreter
 GHC.Runtime.Interpreter.Types
 GHC.Settings
 GHC.Settings.Config
 GHC.Settings.Constants
+GHC.Settings.IO
 GHC.Stg.Syntax
 GHC.StgToCmm.Types
+GHC.SysTools
+GHC.SysTools.Ar
 GHC.SysTools.BaseDir
+GHC.SysTools.Elf
+GHC.SysTools.Info
+GHC.SysTools.Process
+GHC.SysTools.Tasks
 GHC.SysTools.Terminal
 GHC.Tc.Errors.Hole.FitTypes
 GHC.Tc.Errors.Ppr
@@ -244,6 +268,7 @@ GHC.Unit.Parser
 GHC.Unit.Ppr
 GHC.Unit.State
 GHC.Unit.Types
+GHC.Utils.Asm
 GHC.Utils.Binary
 GHC.Utils.Binary.Typeable
 GHC.Utils.BufHandle
diff --git a/testsuite/tests/count-deps/CountDepsParser.stdout b/testsuite/tests/count-deps/CountDepsParser.stdout
index 1e86aeb777..5296248167 100644
--- a/testsuite/tests/count-deps/CountDepsParser.stdout
+++ b/testsuite/tests/count-deps/CountDepsParser.stdout
@@ -1,4 +1,4 @@
-Found 283 GHC.Parser module dependencies
+Found 308 GHC.Parser module dependencies
 GHC.Builtin.Names
 GHC.Builtin.PrimOps
 GHC.Builtin.Types
@@ -15,10 +15,15 @@ GHC.Cmm.Dataflow.Label
 GHC.Cmm.Expr
 GHC.Cmm.MachOp
 GHC.Cmm.Node
+GHC.Cmm.Ppr.Expr
 GHC.Cmm.Switch
 GHC.Cmm.Type
+GHC.Cmm.Utils
 GHC.CmmToAsm.CFG.Weight
 GHC.CmmToAsm.Config
+GHC.CmmToAsm.Ppr
+GHC.CmmToLlvm.Base
+GHC.CmmToLlvm.Regs
 GHC.Core
 GHC.Core.Class
 GHC.Core.Coercion
@@ -123,7 +128,18 @@ GHC.Iface.Ext.Fields
 GHC.Iface.Recomp.Binary
 GHC.Iface.Syntax
 GHC.Iface.Type
+GHC.Linker.Dynamic
+GHC.Linker.ExtraObj
+GHC.Linker.MacOS
+GHC.Linker.Static
 GHC.Linker.Types
+GHC.Linker.Unit
+GHC.Linker.Windows
+GHC.Llvm
+GHC.Llvm.MetaData
+GHC.Llvm.Ppr
+GHC.Llvm.Syntax
+GHC.Llvm.Types
 GHC.Parser
 GHC.Parser.Annotation
 GHC.Parser.CharClass
@@ -154,13 +170,21 @@ GHC.Prelude
 GHC.Runtime.Context
 GHC.Runtime.Eval.Types
 GHC.Runtime.Heap.Layout
+GHC.Runtime.Interpreter
 GHC.Runtime.Interpreter.Types
 GHC.Settings
 GHC.Settings.Config
 GHC.Settings.Constants
+GHC.Settings.IO
 GHC.Stg.Syntax
 GHC.StgToCmm.Types
+GHC.SysTools
+GHC.SysTools.Ar
 GHC.SysTools.BaseDir
+GHC.SysTools.Elf
+GHC.SysTools.Info
+GHC.SysTools.Process
+GHC.SysTools.Tasks
 GHC.SysTools.Terminal
 GHC.Tc.Errors.Hole.FitTypes
 GHC.Tc.Errors.Ppr
@@ -250,6 +274,7 @@ GHC.Unit.Parser
 GHC.Unit.Ppr
 GHC.Unit.State
 GHC.Unit.Types
+GHC.Utils.Asm
 GHC.Utils.Binary
 GHC.Utils.Binary.Typeable
 GHC.Utils.BufHandle
diff --git a/testsuite/tests/deriving/should_fail/T14365.stderr b/testsuite/tests/deriving/should_fail/T14365.stderr
index f8f106fea8..a166953cf5 100644
--- a/testsuite/tests/deriving/should_fail/T14365.stderr
+++ b/testsuite/tests/deriving/should_fail/T14365.stderr
@@ -11,3 +11,4 @@ T14365B.hs-boot:7:1: error:
         Cannot derive instances in hs-boot files
         Write an instance declaration instead
     • In the stand-alone deriving instance for ‘Foldable Foo’
+[3 of 3] Compiling T14365B          ( T14365B.hs, T14365B.o )
diff --git a/testsuite/tests/driver/T12983/T12983.stdout b/testsuite/tests/driver/T12983/T12983.stdout
index 321e702d27..3e34b745fc 100644
--- a/testsuite/tests/driver/T12983/T12983.stdout
+++ b/testsuite/tests/driver/T12983/T12983.stdout
@@ -1,18 +1,18 @@
 
 Preparing everyting with --make ...
 
-[1 of 3] Compiling Hospital
-[2 of 3] Compiling Types
-[3 of 3] Compiling Main
-Linking src/MetaHandler ...
+[1 of 4] Compiling Hospital
+[2 of 4] Compiling Types
+[3 of 4] Compiling Main
+[4 of 4] Linking src/MetaHandler
 Done with preparations with --make
 
 Building with --make
 
-[1 of 4] Compiling ShortText
-[2 of 4] Compiling Hospital [Source file changed]
-[4 of 4] Compiling Main [Hospital[TH] changed]
-Linking src/MetaHandler ...
+[1 of 5] Compiling ShortText
+[2 of 5] Compiling Hospital [Source file changed]
+[4 of 5] Compiling Main [Hospital[TH] changed]
+[5 of 5] Linking src/MetaHandler [Objects changed]
 
 Preparing everything ...
 src/Hospital.hs
diff --git a/testsuite/tests/driver/T13914/T13914.stdout b/testsuite/tests/driver/T13914/T13914.stdout
index d443ed47b9..6453a0011c 100644
--- a/testsuite/tests/driver/T13914/T13914.stdout
+++ b/testsuite/tests/driver/T13914/T13914.stdout
@@ -1,16 +1,16 @@
 Without -fignore-asserts
-[1 of 1] Compiling Main             ( main.hs, main.o )
-Linking main ...
+[1 of 2] Compiling Main             ( main.hs, main.o )
+[2 of 2] Linking main
 main: Assertion failed
 CallStack (from HasCallStack):
   assert, called at main.hs:3:8 in main:Main
 With -fignore-asserts
-[1 of 1] Compiling Main             ( main.hs, main.o ) [Optimisation flags changed]
-Linking main ...
+[1 of 2] Compiling Main             ( main.hs, main.o ) [Optimisation flags changed]
+[2 of 2] Linking main [Objects changed]
 OK
 Without -fignore-asserts
-[1 of 1] Compiling Main             ( main.hs, main.o ) [Optimisation flags changed]
-Linking main ...
+[1 of 2] Compiling Main             ( main.hs, main.o ) [Optimisation flags changed]
+[2 of 2] Linking main [Objects changed]
 main: Assertion failed
 CallStack (from HasCallStack):
   assert, called at main.hs:3:8 in main:Main
diff --git a/testsuite/tests/driver/T14075/F.hs b/testsuite/tests/driver/T14075/F.hs
index 3e32036eb4..9d1234e366 100644
--- a/testsuite/tests/driver/T14075/F.hs
+++ b/testsuite/tests/driver/T14075/F.hs
@@ -1 +1,3 @@
 module F () where
+
+import V
diff --git a/testsuite/tests/driver/T16608/T16608_1.stdout b/testsuite/tests/driver/T16608/T16608_1.stdout
index f925d67b8c..ce5a336950 100644
--- a/testsuite/tests/driver/T16608/T16608_1.stdout
+++ b/testsuite/tests/driver/T16608/T16608_1.stdout
@@ -1,7 +1,7 @@
-[1 of 2] Compiling MyInteger        ( MyInteger.hs, MyInteger.o )
-[2 of 2] Compiling Main             ( T16608_1.hs, T16608_1.o )
-Linking T16608_1 ...
+[1 of 3] Compiling MyInteger        ( MyInteger.hs, MyInteger.o )
+[2 of 3] Compiling Main             ( T16608_1.hs, T16608_1.o )
+[3 of 3] Linking T16608_1
 41
-[1 of 2] Compiling MyInteger        ( MyInteger.hs, MyInteger.o ) [Source file changed]
-Linking T16608_1 ...
+[1 of 3] Compiling MyInteger        ( MyInteger.hs, MyInteger.o ) [Source file changed]
+[3 of 3] Linking T16608_1 [Objects changed]
 42
diff --git a/testsuite/tests/driver/T16608/T16608_2.stdout b/testsuite/tests/driver/T16608/T16608_2.stdout
index af2de7e698..8935c0bb3f 100644
--- a/testsuite/tests/driver/T16608/T16608_2.stdout
+++ b/testsuite/tests/driver/T16608/T16608_2.stdout
@@ -1,7 +1,7 @@
-[1 of 2] Compiling MyInteger        ( MyInteger.hs, MyInteger.o )
-[2 of 2] Compiling Main             ( T16608_2.hs, T16608_2.o )
-Linking T16608_2 ...
+[1 of 3] Compiling MyInteger        ( MyInteger.hs, MyInteger.o )
+[2 of 3] Compiling Main             ( T16608_2.hs, T16608_2.o )
+[3 of 3] Linking T16608_2
 41
-[1 of 2] Compiling MyInteger        ( MyInteger.hs, MyInteger.o ) [Source file changed]
-Linking T16608_2 ...
+[1 of 3] Compiling MyInteger        ( MyInteger.hs, MyInteger.o ) [Source file changed]
+[3 of 3] Linking T16608_2 [Objects changed]
 42
diff --git a/testsuite/tests/driver/T17481.stdout b/testsuite/tests/driver/T17481.stdout
index 885dac3986..204b0ee2af 100644
--- a/testsuite/tests/driver/T17481.stdout
+++ b/testsuite/tests/driver/T17481.stdout
@@ -1,14 +1,14 @@
 Main.hs is now:
 main = putStrLn "Hello from A"
 Compiling and running Main.hs:
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main
 Hello from A
 Main.hs is now:
 main = putStrLn "Hello from B"
 Compiling and running Main.hs:
-[1 of 1] Compiling Main             ( Main.hs, Main.o ) [Source file changed]
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o ) [Source file changed]
+[2 of 2] Linking Main [Objects changed]
 Hello from B
 Touching Main.hs
 Compiling and running Main.hs:
diff --git a/testsuite/tests/driver/T17586/T17586.stdout b/testsuite/tests/driver/T17586/T17586.stdout
index d0bb37090e..e541917636 100644
--- a/testsuite/tests/driver/T17586/T17586.stdout
+++ b/testsuite/tests/driver/T17586/T17586.stdout
@@ -1,6 +1,6 @@
-[1 of 1] Compiling Main             ( T17586.hs, T17586.o )
-Linking T17586 ...
+[1 of 2] Compiling Main             ( T17586.hs, T17586.o )
+[2 of 2] Linking T17586
 hello world
-[1 of 1] Compiling Main             ( T17586.hs, T17586.o ) [Flags changed]
-Linking T17586 ...
+[1 of 2] Compiling Main             ( T17586.hs, T17586.o ) [Flags changed]
+[2 of 2] Linking T17586 [Objects changed]
 hello world
diff --git a/testsuite/tests/driver/T20300/T20300.stderr b/testsuite/tests/driver/T20300/T20300.stderr
index 1a93d8d7ba..37b55fd9c1 100644
--- a/testsuite/tests/driver/T20300/T20300.stderr
+++ b/testsuite/tests/driver/T20300/T20300.stderr
@@ -1,4 +1,4 @@
 [1 of 4] Compiling T[boot]          ( T.hs-boot, nothing )
 [2 of 4] Compiling S                ( S.hs, S.o, S.dyn_o )
-[3 of 4] Compiling T                ( T.hs, T.o, T.dyn_o )
+[3 of 4] Compiling T                ( T.hs, nothing )
 [4 of 4] Compiling Top              ( Top.hs, nothing )
diff --git a/testsuite/tests/driver/T20459.stderr b/testsuite/tests/driver/T20459.stderr
index 63ae634930..f37ef0be3e 100644
--- a/testsuite/tests/driver/T20459.stderr
+++ b/testsuite/tests/driver/T20459.stderr
@@ -1,2 +1,2 @@
-Module imports form a cycle:
+Module graph contains a cycle:
   module ‘T20459A’ (./T20459A.hs) imports itself
diff --git a/testsuite/tests/driver/T437/T437.stdout b/testsuite/tests/driver/T437/T437.stdout
index 2057b5df86..3dd0b5cc3b 100644
--- a/testsuite/tests/driver/T437/T437.stdout
+++ b/testsuite/tests/driver/T437/T437.stdout
@@ -1,10 +1,10 @@
-[1 of 2] Compiling Test2            ( Test2.hs, Test2.o )
-[2 of 2] Compiling Test             ( Test.hs, Test.o )
-Linking Test ...
-[1 of 1] Compiling Test2            ( Test2.hs, Test2.o ) [Flags changed]
-Linking Test2 ...
+[1 of 3] Compiling Test2            ( Test2.hs, Test2.o )
+[2 of 3] Compiling Test             ( Test.hs, Test.o )
+[3 of 3] Linking Test
+[1 of 2] Compiling Test2            ( Test2.hs, Test2.o ) [Flags changed]
+[2 of 2] Linking Test2
 "Test2.doit"
 "Test2.main"
-[1 of 1] Compiling Test2            ( Test2.hs, Test2.o ) [Flags changed]
-Linking Test2 ...
+[1 of 2] Compiling Test2            ( Test2.hs, Test2.o ) [Flags changed]
+[2 of 2] Linking Test2 [Objects changed]
 "Test2.doit"
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index be93ec1d51..62cbf27e8c 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -299,3 +299,4 @@ test('T20439', normal, run_command,
       {compiler} -E -fno-code -XCPP -v Foo.hs 2>&1 | grep "Copying" | sed "s/.*to//" '])
 test('T20459', normal, multimod_compile_fail,
      ['T20459B', ''])
+test('MultiRootsErr', normal, multimod_compile_fail, ['MultiRootsErr', 'MultiRootsErr'])
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout
index d80c899cb1..76ad05bb37 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeA.stdout
@@ -1,6 +1,6 @@
-[1 of 3] Compiling A                ( A.hs, A.o, A.dyn_o )
-[2 of 3] Compiling B                ( B.hs, B.o, B.dyn_o )
-[3 of 3] Compiling Main             ( C.hs, C.o, C.dyn_o )
-Linking C ...
-[2 of 3] Compiling B                ( B.hs, B.o, B.dyn_o ) [Missing dynamic interface file]
-Linking C ...
+[1 of 4] Compiling A                ( A.hs, A.o, A.dyn_o )
+[2 of 4] Compiling B                ( B.hs, B.o, B.dyn_o )
+[3 of 4] Compiling Main             ( C.hs, C.o, C.dyn_o )
+[4 of 4] Linking C
+[2 of 4] Compiling B                ( B.hs, B.o, B.dyn_o ) [Missing dynamic interface file]
+[4 of 4] Linking C [Objects changed]
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout
index 56caf28582..1e2de97295 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/dynamicToo001MakeB.stdout
@@ -1,3 +1,3 @@
-[2 of 3] Compiling B                ( B.hs, B.o, B.dyn_o ) [Mismatched dynamic interface file]
-[3 of 3] Compiling Main             ( C.hs, C.o, C.dyn_o )
-Linking C ...
+[2 of 4] Compiling B                ( B.hs, B.o, B.dyn_o ) [Mismatched dynamic interface file]
+[3 of 4] Compiling Main             ( C.hs, C.o, C.dyn_o )
+[4 of 4] Linking C
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout
index 5c33cb2e7a..243efe5829 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout
@@ -1,2 +1,2 @@
-[1 of 1] Compiling Main             ( Main.hs, Main.o, Main.dyn_o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o, Main.dyn_o )
+[2 of 2] Linking Main
diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout
index 1160663b4d..c6b194ef17 100644
--- a/testsuite/tests/driver/recomp007/recomp007.stdout
+++ b/testsuite/tests/driver/recomp007/recomp007.stdout
@@ -1,6 +1,6 @@
 "1.0"
 Preprocessing executable 'test' for b-1.0..
 Building executable 'test' for b-1.0..
-[1 of 2] Compiling B                ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed]
-Linking dist/build/test/test ...
+[1 of 3] Compiling B                ( B.hs, dist/build/test/test-tmp/B.o ) [A package changed]
+[3 of 3] Linking dist/build/test/test [Objects changed]
 "2.0"
diff --git a/testsuite/tests/driver/recomp011/recomp011.stdout b/testsuite/tests/driver/recomp011/recomp011.stdout
index d3e0b92508..c320549f54 100644
--- a/testsuite/tests/driver/recomp011/recomp011.stdout
+++ b/testsuite/tests/driver/recomp011/recomp011.stdout
@@ -1,10 +1,10 @@
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main
 42
-[1 of 1] Compiling Main             ( Main.hs, Main.o ) [B.hsinc changed]
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o ) [B.hsinc changed]
+[2 of 2] Linking Main [Objects changed]
 43
-[1 of 1] Compiling Main             ( Main.hs, Main.o ) [A.hsinc changed]
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o ) [A.hsinc changed]
+[2 of 2] Linking Main [Objects changed]
 4343
 4343
diff --git a/testsuite/tests/driver/recomp015/recomp015.stdout b/testsuite/tests/driver/recomp015/recomp015.stdout
index a7dbad203a..2de39b6c87 100644
--- a/testsuite/tests/driver/recomp015/recomp015.stdout
+++ b/testsuite/tests/driver/recomp015/recomp015.stdout
@@ -1,6 +1,6 @@
-[1 of 1] Compiling Main             ( Generate.hs, Generate.o )
-Linking Generate ...
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Generate.hs, Generate.o )
+[2 of 2] Linking Generate
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main
 Running main...
 Running main...
diff --git a/testsuite/tests/driver/recomp019/recomp019.stdout b/testsuite/tests/driver/recomp019/recomp019.stdout
index 413dad2e0f..300fe27867 100644
--- a/testsuite/tests/driver/recomp019/recomp019.stdout
+++ b/testsuite/tests/driver/recomp019/recomp019.stdout
@@ -1,11 +1,11 @@
 first run
-[1 of 3] Compiling B                ( B.hs, B.o )
-[2 of 3] Compiling C                ( C.hs, C.o )
-[3 of 3] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 4] Compiling B                ( B.hs, B.o )
+[2 of 4] Compiling C                ( C.hs, C.o )
+[3 of 4] Compiling Main             ( Main.hs, Main.o )
+[4 of 4] Linking Main
 5
 [1 of 1] Compiling B                ( B.hs, nothing ) [Source file changed]
 second run
-[1 of 3] Compiling B                ( B.hs, B.o ) [Missing object file]
-Linking Main ...
+[1 of 4] Compiling B                ( B.hs, B.o ) [Missing object file]
+[4 of 4] Linking Main [Objects changed]
 15
diff --git a/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout b/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout
index 86d6324225..ee1cbe982d 100644
--- a/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout
+++ b/testsuite/tests/driver/recompChangedPackage/recompChangedPackage.stdout
@@ -1,10 +1,10 @@
-[1 of 2] Compiling PLib             ( PLib.hs, PLib.o )
-[2 of 2] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 3] Compiling PLib             ( PLib.hs, PLib.o )
+[2 of 3] Compiling Main             ( Main.hs, Main.o )
+[3 of 3] Linking Main
 "q"
 tmp.d
     q-0.1.0.0
 
-[1 of 1] Compiling Main             ( Main.hs, Main.o ) [PLib removed]
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o ) [PLib removed]
+[2 of 2] Linking Main [Objects changed]
 empty
diff --git a/testsuite/tests/driver/retc001/retc001.stdout b/testsuite/tests/driver/retc001/retc001.stdout
index e5d374608e..a5bdd0597e 100644
--- a/testsuite/tests/driver/retc001/retc001.stdout
+++ b/testsuite/tests/driver/retc001/retc001.stdout
@@ -1,7 +1,7 @@
-[1 of 3] Compiling A                ( A.hs, nothing )
-[2 of 3] Compiling B                ( B.hs, nothing )
-[3 of 3] Compiling Main             ( C.hs, nothing )
+[1 of 4] Compiling A                ( A.hs, nothing )
+[2 of 4] Compiling B                ( B.hs, nothing )
+[3 of 4] Compiling Main             ( C.hs, nothing )
 Middle
 End
-[2 of 3] Compiling B                ( B.hs, nothing ) [Source file changed]
-[3 of 3] Compiling Main             ( C.hs, nothing ) [B changed]
+[2 of 4] Compiling B                ( B.hs, nothing ) [Source file changed]
+[3 of 4] Compiling Main             ( C.hs, nothing ) [B changed]
diff --git a/testsuite/tests/driver/should_fail/T10895.stderr b/testsuite/tests/driver/should_fail/T10895.stderr
index 3ae52a3ef7..ff8a380809 100644
--- a/testsuite/tests/driver/should_fail/T10895.stderr
+++ b/testsuite/tests/driver/should_fail/T10895.stderr
@@ -1,4 +1,4 @@
 
 <no location info>: error:
-    output was redirected with -o, but no output will be generated
-because there is no Main module.
+    Output was redirected with -o, but no output will be generated.
+    There is no module named ‘Main’.
diff --git a/testsuite/tests/driver/th-new-test/th-new-test.stdout b/testsuite/tests/driver/th-new-test/th-new-test.stdout
index 7f31ce608f..5de19bdd0a 100644
--- a/testsuite/tests/driver/th-new-test/th-new-test.stdout
+++ b/testsuite/tests/driver/th-new-test/th-new-test.stdout
@@ -1,17 +1,17 @@
-[1 of 5] Compiling B
-[2 of 5] Compiling A
-[3 of 5] Compiling D
-[4 of 5] Compiling C
-[5 of 5] Compiling Main
-Linking Main ...
-[1 of 5] Compiling B [Source file changed]
-[2 of 5] Compiling A [B[TH] changed]
-Linking Main ...
-[3 of 5] Compiling D [Source file changed]
-[4 of 5] Compiling C [D[TH] changed]
-Linking Main ...
-[1 of 5] Compiling B [Source file changed]
-[2 of 5] Compiling A [B[TH] changed]
-[3 of 5] Compiling D [Source file changed]
-[4 of 5] Compiling C [D[TH] changed]
-Linking Main ...
+[1 of 6] Compiling B
+[2 of 6] Compiling A
+[3 of 6] Compiling D
+[4 of 6] Compiling C
+[5 of 6] Compiling Main
+[6 of 6] Linking Main
+[1 of 6] Compiling B [Source file changed]
+[2 of 6] Compiling A [B[TH] changed]
+[6 of 6] Linking Main [Objects changed]
+[3 of 6] Compiling D [Source file changed]
+[4 of 6] Compiling C [D[TH] changed]
+[6 of 6] Linking Main [Objects changed]
+[1 of 6] Compiling B [Source file changed]
+[2 of 6] Compiling A [B[TH] changed]
+[3 of 6] Compiling D [Source file changed]
+[4 of 6] Compiling C [D[TH] changed]
+[6 of 6] Linking Main [Objects changed]
diff --git a/testsuite/tests/ghc-api/T10052/T10052.stdout b/testsuite/tests/ghc-api/T10052/T10052.stdout
index 1a909eb36f..2506dc338e 100644
--- a/testsuite/tests/ghc-api/T10052/T10052.stdout
+++ b/testsuite/tests/ghc-api/T10052/T10052.stdout
@@ -1 +1 @@
-[1 of 1] Compiling Main             ( T10052-input.hs, interpreted )
+[1 of 2] Compiling Main             ( T10052-input.hs, interpreted )
diff --git a/testsuite/tests/ghc-api/T7478/T7478.stdout b/testsuite/tests/ghc-api/T7478/T7478.stdout
index 372cf9bfa3..e2323ab013 100644
--- a/testsuite/tests/ghc-api/T7478/T7478.stdout
+++ b/testsuite/tests/ghc-api/T7478/T7478.stdout
@@ -1,8 +1,8 @@
 ----- 0 ------
-(0,"[1 of 2] Compiling B                ( B.hs, B.o )")
-(0,"[2 of 2] Compiling Main             ( A.hs, A.o )")
+(0,"[1 of 3] Compiling B                ( B.hs, B.o )")
+(0,"[2 of 3] Compiling Main             ( A.hs, A.o )")
 ----- 1 ------
-(1,"[2 of 2] Compiling Main             ( A.hs, A.o )")
+(1,"[2 of 3] Compiling Main             ( A.hs, A.o )")
 ----- 2 ------
-(2,"[1 of 1] Compiling Main             ( C.hs, C.o )")
-(2,"Linking A ...")
+(2,"[1 of 2] Compiling Main             ( C.hs, C.o )")
+(2,"[2 of 2] Linking C")
diff --git a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
index ca1740358f..cf9b1f475d 100644
--- a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
+++ b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
@@ -6,12 +6,13 @@ import GHC
 import GHC.Driver.Make
 import GHC.Driver.Session
 import GHC.Driver.Env
-import GHC.Unit.Module.ModSummary (ExtendedModSummary(..))
+import GHC.Unit.Module.Graph
 import GHC.Unit.Finder
 
 import Control.Monad.IO.Class (liftIO)
 import Data.List (sort, stripPrefix)
 import Data.Either
+import Data.Maybe
 
 import System.Environment
 import System.Directory
@@ -48,18 +49,18 @@ main = do
 
     _emss <- downsweep hsc_env [] [] False
 
-    flushFinderCaches (hsc_FC hsc_env) (hsc_home_unit hsc_env)
+    flushFinderCaches (hsc_FC hsc_env) (hsc_unit_env hsc_env)
     createDirectoryIfMissing False "mydir"
     renameFile "B.hs" "mydir/B.hs"
 
-    emss <- downsweep hsc_env [] [] False
+    (_, nodes) <- downsweep hsc_env [] [] False
 
     -- If 'checkSummaryTimestamp' were to call 'addHomeModuleToFinder' with
     -- (ms_location old_summary) like summariseFile used to instead of
     -- using the 'location' parameter we'd end up using the old location of
     -- the "B" module in this test. Make sure that doesn't happen.
 
-    hPrint stderr $ sort (map (ml_hs_file . ms_location) (map emsModSummary (rights emss)))
+    hPrint stderr $ sort (map (ml_hs_file . ms_location) (mapMaybe moduleGraphNodeModule nodes))
 
 writeMod :: [String] -> IO ()
 writeMod src@(head -> stripPrefix "module " -> Just (takeWhile (/=' ') -> mod))
diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
index 7a0a3ccf8d..8203c65af0 100644
--- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
+++ b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
@@ -6,10 +6,10 @@
 import GHC
 import GHC.Driver.Make
 import GHC.Driver.Session
-import GHC.Unit.Module.ModSummary (ExtendedModSummary(..))
 import GHC.Utils.Outputable
 import GHC.Utils.Exception (ExceptionMonad)
 import GHC.Data.Bag
+import GHC.Unit.Module.Graph
 
 import Control.Monad
 import Control.Monad.Catch as MC (handle)
@@ -18,6 +18,7 @@ import Control.Exception
 import Data.IORef
 import Data.List (sort, find, stripPrefix, isPrefixOf, isSuffixOf)
 import Data.Either
+import Data.Maybe
 
 import System.Environment
 import System.Exit
@@ -167,11 +168,9 @@ go label mods cnd =
     setTargets [tgt]
 
     hsc_env <- getSession
-    emss <- liftIO $ downsweep hsc_env [] [] False
-    -- liftIO $ hPutStrLn stderr $ showSDoc (hsc_dflags hsc_env) $ ppr $ rights emss
-    -- liftIO $ hPrint stderr $ bagToList $ unionManyBags $ lefts emss
+    (_, nodes) <- liftIO $ downsweep hsc_env [] [] False
 
-    it label $ cnd (map emsModSummary (rights emss))
+    it label $ cnd (mapMaybe moduleGraphNodeModule nodes)
 
 
 writeMod :: [String] -> IO ()
diff --git a/testsuite/tests/ghci/scripts/T18330.stdout b/testsuite/tests/ghci/scripts/T18330.stdout
index c020ae7dbb..c95aa0e11b 100644
--- a/testsuite/tests/ghci/scripts/T18330.stdout
+++ b/testsuite/tests/ghci/scripts/T18330.stdout
@@ -1,5 +1,6 @@
-GHCi, version 9.3.20210616: https://www.haskell.org/ghc/  :? for help
-ghci> [1 of 1] Compiling Main             ( shell.hs, interpreted )
+GHCi, version 9.3.20211019: https://www.haskell.org/ghc/  :? for help
+ghci> [1 of 2] Compiling Main             ( shell.hs, interpreted )
+[2 of 2] Linking shell
 Ok, one module loaded.
 ghci> ghci> [1 of 1] Compiling T18330           ( T18330.hs, interpreted )
 Ok, one module loaded.
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index 884df5a811..d90051d26f 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -350,3 +350,5 @@ test('T7388', normal, ghci_script, ['T7388.script'])
 test('T20627', normal, ghci_script, ['T20627.script'])
 test('T20473a', normal, ghci_script, ['T20473a.script'])
 test('T20473b', normal, ghci_script, ['T20473b.script'])
+test('T20587', [extra_files(['../shell.hs'])], ghci_script,
+                ['T20587.script'])
diff --git a/testsuite/tests/ghci/scripts/ghci021.stderr b/testsuite/tests/ghci/scripts/ghci021.stderr
index ea7488174e..2e5a3d5a0e 100644
--- a/testsuite/tests/ghci/scripts/ghci021.stderr
+++ b/testsuite/tests/ghci/scripts/ghci021.stderr
@@ -1,2 +1,2 @@
 
-<no location info>: no such module: ‘ThisDoesNotExist’
+<no location info>: error: no such module: ‘main:ThisDoesNotExist’
diff --git a/testsuite/tests/hp2ps/T15904.stdout b/testsuite/tests/hp2ps/T15904.stdout
index e77005b2eb..5005beaba7 100644
--- a/testsuite/tests/hp2ps/T15904.stdout
+++ b/testsuite/tests/hp2ps/T15904.stdout
@@ -1,5 +1,5 @@
-[1 of 1] Compiling T15904           ( T15904.hs, T15904.o )
-Linking "T15904" ...
+[1 of 2] Compiling T15904           ( T15904.hs, T15904.o )
+[2 of 2] Linking "T15904"
 {"e": 2.72, "pi": 3.14}
 \
 
diff --git a/testsuite/tests/indexed-types/should_compile/impexp.stderr b/testsuite/tests/indexed-types/should_compile/impexp.stderr
index 7ebebe9e03..c57f611d6f 100644
--- a/testsuite/tests/indexed-types/should_compile/impexp.stderr
+++ b/testsuite/tests/indexed-types/should_compile/impexp.stderr
@@ -1,2 +1,2 @@
-[1 of 2] Compiling Exp              ( Exp.hs, Exp.o )
-[2 of 2] Compiling Imp              ( Imp.hs, Imp.o )
+[1 of 3] Compiling Exp              ( Exp.hs, Exp.o )
+[2 of 3] Compiling Imp              ( Imp.hs, Imp.o )
diff --git a/testsuite/tests/overloadedrecflds/should_fail/hasfieldfail01.stderr b/testsuite/tests/overloadedrecflds/should_fail/hasfieldfail01.stderr
index f2d5586103..086d951580 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/hasfieldfail01.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/hasfieldfail01.stderr
@@ -1,5 +1,5 @@
-[1 of 2] Compiling HasFieldFail01_A ( HasFieldFail01_A.hs, HasFieldFail01_A.o )
-[2 of 2] Compiling Main             ( hasfieldfail01.hs, hasfieldfail01.o )
+[1 of 3] Compiling HasFieldFail01_A ( HasFieldFail01_A.hs, HasFieldFail01_A.o )
+[2 of 3] Compiling Main             ( hasfieldfail01.hs, hasfieldfail01.o )
 
 hasfieldfail01.hs:9:15: error:
     • No instance for (HasField "foo" T Int)
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr
index 6f5e7588f1..fe4b469e62 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.stderr
@@ -1,7 +1,7 @@
-[1 of 2] Compiling OverloadedRecFldsFail04_A ( OverloadedRecFldsFail04_A.hs, OverloadedRecFldsFail04_A.o )
-[2 of 2] Compiling Main             ( overloadedrecfldsfail04.hs, overloadedrecfldsfail04.o )
+[1 of 3] Compiling OverloadedRecFldsFail04_A ( OverloadedRecFldsFail04_A.hs, OverloadedRecFldsFail04_A.o )
+[2 of 3] Compiling Main             ( overloadedrecfldsfail04.hs, overloadedrecfldsfail04.o )
 
- overloadedrecfldsfail04.hs:9:6:
+overloadedrecfldsfail04.hs:9:6: error:
     Ambiguous occurrence ‘I.x’
     It could refer to
        either the field ‘x’,
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr
index 254931a9bc..10e3b1ece8 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail06.stderr
@@ -1,4 +1,4 @@
-[1 of 2] Compiling OverloadedRecFldsFail06_A ( OverloadedRecFldsFail06_A.hs, OverloadedRecFldsFail06_A.o )
+[1 of 3] Compiling OverloadedRecFldsFail06_A ( OverloadedRecFldsFail06_A.hs, OverloadedRecFldsFail06_A.o )
 
 OverloadedRecFldsFail06_A.hs:9:15: warning: [-Wunused-top-binds (in -Wextra, -Wunused-binds)]
     Defined but not used: data constructor ‘MkUnused’
@@ -8,7 +8,7 @@ OverloadedRecFldsFail06_A.hs:9:42: warning: [-Wunused-top-binds (in -Wextra, -Wu
 
 OverloadedRecFldsFail06_A.hs:9:59: warning: [-Wunused-top-binds (in -Wextra, -Wunused-binds)]
     Defined but not used: ‘used_locally’
-[2 of 2] Compiling Main             ( overloadedrecfldsfail06.hs, overloadedrecfldsfail06.o )
+[2 of 3] Compiling Main             ( overloadedrecfldsfail06.hs, overloadedrecfldsfail06.o )
 
 overloadedrecfldsfail06.hs:7:1: error: [-Wunused-imports (in -Wextra), -Werror=unused-imports]
     The import of ‘Unused(unused), V(x), U(y), MkV, Unused’
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr
index 9be384b500..cf483418ce 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail10.stderr
@@ -1,7 +1,7 @@
-[1 of 4] Compiling OverloadedRecFldsFail10_A ( OverloadedRecFldsFail10_A.hs, OverloadedRecFldsFail10_A.o )
-[2 of 4] Compiling OverloadedRecFldsFail10_B ( OverloadedRecFldsFail10_B.hs, OverloadedRecFldsFail10_B.o )
-[3 of 4] Compiling OverloadedRecFldsFail10_C ( OverloadedRecFldsFail10_C.hs, OverloadedRecFldsFail10_C.o )
-[4 of 4] Compiling Main             ( overloadedrecfldsfail10.hs, overloadedrecfldsfail10.o )
+[1 of 5] Compiling OverloadedRecFldsFail10_A ( OverloadedRecFldsFail10_A.hs, OverloadedRecFldsFail10_A.o )
+[2 of 5] Compiling OverloadedRecFldsFail10_B ( OverloadedRecFldsFail10_B.hs, OverloadedRecFldsFail10_B.o )
+[3 of 5] Compiling OverloadedRecFldsFail10_C ( OverloadedRecFldsFail10_C.hs, OverloadedRecFldsFail10_C.o )
+[4 of 5] Compiling Main             ( overloadedrecfldsfail10.hs, overloadedrecfldsfail10.o )
 
 overloadedrecfldsfail10.hs:6:20: error:
     Conflicting exports for ‘foo’:
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr
index 687af43de1..a509f54beb 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail11.stderr
@@ -1,7 +1,7 @@
-[1 of 2] Compiling OverloadedRecFldsFail11_A ( OverloadedRecFldsFail11_A.hs, OverloadedRecFldsFail11_A.o )
-[2 of 2] Compiling Main             ( overloadedrecfldsfail11.hs, overloadedrecfldsfail11.o )
+[1 of 3] Compiling OverloadedRecFldsFail11_A ( OverloadedRecFldsFail11_A.hs, OverloadedRecFldsFail11_A.o )
+[2 of 3] Compiling Main             ( overloadedrecfldsfail11.hs, overloadedrecfldsfail11.o )
 
-overloadedrecfldsfail11.hs:5:15:
+overloadedrecfldsfail11.hs:5:15: error:
     Ambiguous occurrence ‘foo’
     It could refer to
        either the field ‘foo’,
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr
index b51fb80cca..62f9cd3e3c 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr
@@ -1,7 +1,7 @@
-[1 of 2] Compiling OverloadedRecFldsFail12_A ( OverloadedRecFldsFail12_A.hs, OverloadedRecFldsFail12_A.o )
-[2 of 2] Compiling Main             ( overloadedrecfldsfail12.hs, overloadedrecfldsfail12.o )
+[1 of 3] Compiling OverloadedRecFldsFail12_A ( OverloadedRecFldsFail12_A.hs, OverloadedRecFldsFail12_A.o )
+[2 of 3] Compiling Main             ( overloadedrecfldsfail12.hs, overloadedrecfldsfail12.o )
 
- overloadedrecfldsfail12.hs:13:5:
+overloadedrecfldsfail12.hs:13:5: error:
     Ambiguous occurrence ‘foo’
     It could refer to
        either the field ‘foo’,
@@ -9,7 +9,7 @@
               (and originally defined at OverloadedRecFldsFail12_A.hs:5:16-18)
            or the field ‘foo’, defined at overloadedrecfldsfail12.hs:6:16
 
- overloadedrecfldsfail12.hs:16:5:
+overloadedrecfldsfail12.hs:16:5: error:
     Ambiguous occurrence ‘foo’
     It could refer to
        either the field ‘foo’,
diff --git a/testsuite/tests/parser/should_compile/T5243.stderr b/testsuite/tests/parser/should_compile/T5243.stderr
index 450e001237..5211871a2e 100644
--- a/testsuite/tests/parser/should_compile/T5243.stderr
+++ b/testsuite/tests/parser/should_compile/T5243.stderr
@@ -1,3 +1,3 @@
-[1 of 2] Compiling T5243A           ( T5243A.hs, T5243A.o )
-[2 of 2] Compiling Main             ( T5243.hs, T5243.o )
-Linking T5243 ...
+[1 of 3] Compiling T5243A           ( T5243A.hs, T5243A.o )
+[2 of 3] Compiling Main             ( T5243.hs, T5243.o )
+[3 of 3] Linking T5243
diff --git a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail6.stderr b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail6.stderr
index c53990475b..c9bb7f6647 100644
--- a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail6.stderr
+++ b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail6.stderr
@@ -1,5 +1,5 @@
-[1 of 2] Compiling RecordDotSyntaxA ( RecordDotSyntaxA.hs, RecordDotSyntaxA.o )
- [2 of 2] Compiling Main             ( RecordDotSyntaxFail6.hs, RecordDotSyntaxFail6.o )
+[1 of 3] Compiling RecordDotSyntaxA ( RecordDotSyntaxA.hs, RecordDotSyntaxA.o )
+[2 of 3] Compiling Main             ( RecordDotSyntaxFail6.hs, RecordDotSyntaxFail6.o )
 
-   RecordDotSyntaxFail6.hs:10:17:
+RecordDotSyntaxFail6.hs:10:17: error:
     Fields cannot be qualified when OverloadedRecordUpdate is enabled
diff --git a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail7.stderr b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail7.stderr
index feee41589f..0b0cfcc03a 100644
--- a/testsuite/tests/parser/should_fail/RecordDotSyntaxFail7.stderr
+++ b/testsuite/tests/parser/should_fail/RecordDotSyntaxFail7.stderr
@@ -1,4 +1,4 @@
-[1 of 2] Compiling RecordDotSyntaxA ( RecordDotSyntaxA.hs, RecordDotSyntaxA.o )
-[2 of 2] Compiling Main             ( RecordDotSyntaxFail7.hs, RecordDotSyntaxFail7.o )
+[1 of 3] Compiling RecordDotSyntaxA ( RecordDotSyntaxA.hs, RecordDotSyntaxA.o )
+[2 of 3] Compiling Main             ( RecordDotSyntaxFail7.hs, RecordDotSyntaxFail7.o )
 
-RecordDotSyntaxFail7.hs:9:16: parse error on input ‘A.foo’
+RecordDotSyntaxFail7.hs:9:16: error: parse error on input ‘A.foo’
diff --git a/testsuite/tests/perf/compiler/Makefile b/testsuite/tests/perf/compiler/Makefile
index 20f5704450..1e915f785a 100644
--- a/testsuite/tests/perf/compiler/Makefile
+++ b/testsuite/tests/perf/compiler/Makefile
@@ -16,3 +16,7 @@ T11068:
 MultiModulesRecomp:
 	./genMultiLayerModules
 	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 MultiLayerModules.hs
+
+MultiComponentModulesRecomp:
+	'$(PYTHON)' genMultiComp.py
+	TEST_HC='$(TEST_HC)' TEST_HC_OPTS='$(TEST_HC_OPTS)' ./run
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 28f899f7ef..f1d7ef2e5e 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -293,6 +293,35 @@ test('MultiLayerModulesRecomp',
      multimod_compile,
      ['MultiLayerModules', '-v0'])
 
+
+# A performance test for calculating link dependencies in --make mode.
+test('MultiLayerModulesTH_Make',
+     [ collect_compiler_stats('bytes allocated',3),
+       pre_cmd('./genMultiLayerModulesTH; $TEST_HC $TEST_HC_OPTS MultiLayerModulesPrep -dynamic-too -v0'),
+       extra_files(['genMultiLayerModulesTH']),
+       compile_timeout_multiplier(5)
+       # this is _a lot_
+       # but this test has been failing every now and then,
+       # especially on i386. Let's just give it some room
+       # to complete successfully reliably everywhere.
+     ],
+     multimod_compile_fail,
+     ['MultiLayerModules', '-v0'])
+
+# A performance test for calculating link dependencies in -c mode.
+test('MultiLayerModulesTH_OneShot',
+     [ collect_compiler_stats('bytes allocated',3),
+       pre_cmd('./genMultiLayerModulesTH; cp MultiLayerModules.hs MultiLayerModulesTH_OneShot.hs; $TEST_HC $TEST_HC_OPTS MultiLayerModulesPrep -dynamic-too -v0'),
+       extra_files(['genMultiLayerModulesTH']),
+       compile_timeout_multiplier(5)
+       # this is _a lot_
+       # but this test has been failing every now and then,
+       # especially on i386. Let's just give it some room
+       # to complete successfully reliably everywhere.
+     ],
+     compile_fail,
+     ['-v0'])
+
 test('MultiLayerModulesDefsGhci',
      [ collect_compiler_residency(15),
        pre_cmd('./genMultiLayerModulesDefs'),
@@ -319,6 +348,24 @@ test('MultiLayerModulesNoCode',
      ghci_script,
      ['MultiLayerModulesNoCode.script'])
 
+test('MultiComponentModulesRecomp',
+     [ collect_compiler_stats('bytes allocated', 2),
+       pre_cmd('$MAKE -s --no-print-directory MultiComponentModulesRecomp'),
+       extra_files(['genMultiComp.py']),
+       compile_timeout_multiplier(5)
+     ],
+     multiunit_compile,
+     [['unitp%d' % n for n in range(30)], '-fno-code -fwrite-interface -v0'])
+
+test('MultiComponentModules',
+     [ collect_compiler_stats('bytes allocated', 2),
+       pre_cmd('$PYTHON ./genMultiComp.py'),
+       extra_files(['genMultiComp.py']),
+       compile_timeout_multiplier(5)
+     ],
+     multiunit_compile,
+     [['unitp%d' % n for n in range(30)], '-fno-code -fwrite-interface -v0'])
+
 test('ManyConstructors',
      [ collect_compiler_stats('bytes allocated',2),
        pre_cmd('./genManyConstructors'),
diff --git a/testsuite/tests/plugins/frontend01.stdout b/testsuite/tests/plugins/frontend01.stdout
index 234c91c10b..8f1c7691f5 100644
--- a/testsuite/tests/plugins/frontend01.stdout
+++ b/testsuite/tests/plugins/frontend01.stdout
@@ -1,4 +1,4 @@
 ["foo","bar"]
-[1 of 1] Compiling Main             ( frontend01.hs, frontend01.o )
-Linking frontend01 ...
+[1 of 2] Compiling Main             ( frontend01.hs, frontend01.o )
+[2 of 2] Linking frontend01
 hello world
diff --git a/testsuite/tests/plugins/plugin-recomp-flags.stdout b/testsuite/tests/plugins/plugin-recomp-flags.stdout
index 342fa3e0f8..da1538dd07 100644
--- a/testsuite/tests/plugins/plugin-recomp-flags.stdout
+++ b/testsuite/tests/plugins/plugin-recomp-flags.stdout
@@ -1,4 +1,4 @@
-[1 of 1] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o )
-Linking plugin-recomp-test ...
-[1 of 1] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o ) [Plugin fingerprint changed]
-Linking plugin-recomp-test ...
+[1 of 2] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o )
+[2 of 2] Linking plugin-recomp-test
+[1 of 2] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o ) [Plugin fingerprint changed]
+[2 of 2] Linking plugin-recomp-test [Objects changed]
diff --git a/testsuite/tests/plugins/plugin-recomp-impure.stdout b/testsuite/tests/plugins/plugin-recomp-impure.stdout
index 4a2c0aded6..8703e04dff 100644
--- a/testsuite/tests/plugins/plugin-recomp-impure.stdout
+++ b/testsuite/tests/plugins/plugin-recomp-impure.stdout
@@ -1,4 +1,4 @@
-[1 of 1] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o )
-Linking plugin-recomp-test ...
-[1 of 1] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o ) [Impure plugin forced recompilation]
-Linking plugin-recomp-test ...
+[1 of 2] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o )
+[2 of 2] Linking plugin-recomp-test
+[1 of 2] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o ) [Impure plugin forced recompilation]
+[2 of 2] Linking plugin-recomp-test [Objects changed]
diff --git a/testsuite/tests/plugins/plugin-recomp-pure.stdout b/testsuite/tests/plugins/plugin-recomp-pure.stdout
index a6828318a0..80f8d17697 100644
--- a/testsuite/tests/plugins/plugin-recomp-pure.stdout
+++ b/testsuite/tests/plugins/plugin-recomp-pure.stdout
@@ -1,2 +1,2 @@
-[1 of 1] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o )
-Linking plugin-recomp-test ...
+[1 of 2] Compiling Main             ( plugin-recomp-test.hs, plugin-recomp-test.o )
+[2 of 2] Linking plugin-recomp-test
diff --git a/testsuite/tests/regalloc/regalloc_unit_tests.hs b/testsuite/tests/regalloc/regalloc_unit_tests.hs
index 7726c79b1f..cbe3335719 100644
--- a/testsuite/tests/regalloc/regalloc_unit_tests.hs
+++ b/testsuite/tests/regalloc/regalloc_unit_tests.hs
@@ -51,6 +51,8 @@ import GHC.Utils.Outputable
 import GHC.Types.Basic
 import GHC.Unit.Home
 import GHC.Unit.Finder
+import GHC.Unit.Env
+import GHC.Unit.Home.ModInfo
 import GHC.Driver.Config.Finder
 
 import GHC.Data.Stream as Stream (collect, yield)
diff --git a/testsuite/tests/rts/T9405.stdout b/testsuite/tests/rts/T9405.stdout
index a62f1c2d1b..5bec5f7b4f 100644
--- a/testsuite/tests/rts/T9405.stdout
+++ b/testsuite/tests/rts/T9405.stdout
@@ -1,3 +1,3 @@
-[1 of 1] Compiling Main             ( T9405.hs, T9405.o )
-Linking T9405 ...
+[1 of 2] Compiling Main             ( T9405.hs, T9405.o )
+[2 of 2] Linking T9405
 Ticky-Ticky
diff --git a/testsuite/tests/rts/linker/linker_unload.stdout b/testsuite/tests/rts/linker/linker_unload.stdout
index 84697b99ba..6ae361269f 100644
--- a/testsuite/tests/rts/linker/linker_unload.stdout
+++ b/testsuite/tests/rts/linker/linker_unload.stdout
@@ -1,3 +1,3 @@
-[1 of 1] Compiling LinkerUnload     ( LinkerUnload.hs, LinkerUnload.o )
-Linking linker_unload ...
+[1 of 2] Compiling LinkerUnload     ( LinkerUnload.hs, LinkerUnload.o )
+[2 of 2] Linking linker_unload
 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 
\ No newline at end of file
diff --git a/testsuite/tests/rts/linker/linker_unload_native.stdout b/testsuite/tests/rts/linker/linker_unload_native.stdout
index 6f6f0acf60..cfe18775cd 100644
--- a/testsuite/tests/rts/linker/linker_unload_native.stdout
+++ b/testsuite/tests/rts/linker/linker_unload_native.stdout
@@ -1,3 +1,3 @@
-[1 of 1] Compiling LinkerUnload     ( LinkerUnload.hs, LinkerUnload.o )
-Linking linker_unload_native ...
+[1 of 2] Compiling LinkerUnload     ( LinkerUnload.hs, LinkerUnload.o )
+[2 of 2] Linking linker_unload_native
 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 
\ No newline at end of file
diff --git a/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stdout b/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stdout
index 82f7a2f36d..29b878d591 100644
--- a/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stdout
+++ b/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stdout
@@ -1,2 +1,2 @@
-[1 of 1] Compiling LinkerUnload     ( LinkerUnload.hs, LinkerUnload.o )
-Linking linker_unload_multiple_objs ...
+[1 of 2] Compiling LinkerUnload     ( LinkerUnload.hs, LinkerUnload.o )
+[2 of 2] Linking linker_unload_multiple_objs
diff --git a/testsuite/tests/safeHaskell/check/Check04.stderr b/testsuite/tests/safeHaskell/check/Check04.stderr
index ec3bdb1585..78d206a936 100644
--- a/testsuite/tests/safeHaskell/check/Check04.stderr
+++ b/testsuite/tests/safeHaskell/check/Check04.stderr
@@ -1,2 +1,2 @@
-[4 of 4] Compiling Main             ( Check04.hs, Check04.o )
-Linking Check04 ...
+[4 of 5] Compiling Main             ( Check04.hs, Check04.o )
+[5 of 5] Linking Check04
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
index 00181efaed..33cb566987 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
@@ -1,4 +1,4 @@
-[2 of 2] Compiling Main             ( ImpSafe03.hs, ImpSafe03.o )
+[2 of 3] Compiling Main             ( ImpSafe03.hs, ImpSafe03.o )
 
 <no location info>: error:
-    The package (bytestring-0.10.8.1) is required to be trusted but it isn't!
+    The package (bytestring-0.11.1.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
index 26f04624af..d058bb2599 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SafeLang10_A     ( SafeLang10_A.hs, SafeLang10_A.o )
-[2 of 3] Compiling SafeLang10_B     ( SafeLang10_B.hs, SafeLang10_B.o )
-[3 of 3] Compiling Main             ( SafeLang10.hs, SafeLang10.o )
+[1 of 4] Compiling SafeLang10_A     ( SafeLang10_A.hs, SafeLang10_A.o )
+[2 of 4] Compiling SafeLang10_B     ( SafeLang10_B.hs, SafeLang10_B.o )
+[3 of 4] Compiling Main             ( SafeLang10.hs, SafeLang10.o )
 
 SafeLang10.hs:9:13: error:
     • Unsafe overlapping instances for Pos [Int]
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
index 33bf7ce3fe..2239f73d8f 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
@@ -4,9 +4,9 @@ SafeLang12.hs:3:14: warning:
 
 SafeLang12_B.hs:3:14: warning:
     -XTemplateHaskell is not allowed in Safe Haskell; ignoring -XTemplateHaskell
-[1 of 3] Compiling SafeLang12_A     ( SafeLang12_A.hs, SafeLang12_A.o )
-[2 of 3] Compiling SafeLang12_B     ( SafeLang12_B.hs, SafeLang12_B.o )
-[3 of 3] Compiling Main             ( SafeLang12.hs, SafeLang12.o )
+[1 of 4] Compiling SafeLang12_A     ( SafeLang12_A.hs, SafeLang12_A.o )
+[2 of 4] Compiling SafeLang12_B     ( SafeLang12_B.hs, SafeLang12_B.o )
+[3 of 4] Compiling Main             ( SafeLang12.hs, SafeLang12.o )
 
 SafeLang12.hs:1:1: error:
     Top-level splices are not permitted without TemplateHaskell
diff --git a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
index 1aab52a646..111d0fd19c 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang17.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling SafeLang17_A     ( SafeLang17_A.hs, SafeLang17_A.o )
-[2 of 3] Compiling SafeLang17_B     ( SafeLang17_B.hs, SafeLang17_B.o )
-[3 of 3] Compiling Main             ( SafeLang17.hs, SafeLang17.o )
+[1 of 4] Compiling SafeLang17_A     ( SafeLang17_A.hs, SafeLang17_A.o )
+[2 of 4] Compiling SafeLang17_B     ( SafeLang17_B.hs, SafeLang17_B.o )
+[3 of 4] Compiling Main             ( SafeLang17.hs, SafeLang17.o )
 
 SafeLang17.hs:9:13: error:
     • Unsafe overlapping instances for Pos [Int]
diff --git a/testsuite/tests/tcplugins/TcPlugin_RewritePerf.stderr b/testsuite/tests/tcplugins/TcPlugin_RewritePerf.stderr
index 1600c377f6..1213844c57 100644
--- a/testsuite/tests/tcplugins/TcPlugin_RewritePerf.stderr
+++ b/testsuite/tests/tcplugins/TcPlugin_RewritePerf.stderr
@@ -1,6 +1,6 @@
-[1 of 3] Compiling RewritePerfDefs  ( RewritePerfDefs.hs, RewritePerfDefs.o )
-[2 of 3] Compiling RewritePerfPlugin ( RewritePerfPlugin.hs, RewritePerfPlugin.o )
-[3 of 3] Compiling Main             ( TcPlugin_RewritePerf.hs, TcPlugin_RewritePerf.o )
+[1 of 4] Compiling RewritePerfDefs  ( RewritePerfDefs.hs, RewritePerfDefs.o )
+[2 of 4] Compiling RewritePerfPlugin ( RewritePerfPlugin.hs, RewritePerfPlugin.o )
+[3 of 4] Compiling Main             ( TcPlugin_RewritePerf.hs, TcPlugin_RewritePerf.o )
 
 TcPlugin_RewritePerf.hs:25:8: error:
     • No instance for (Show
diff --git a/testsuite/tests/th/TH_linker/path_with_commas.stdout b/testsuite/tests/th/TH_linker/path_with_commas.stdout
index 0621c2410a..9559dcdc64 100644
--- a/testsuite/tests/th/TH_linker/path_with_commas.stdout
+++ b/testsuite/tests/th/TH_linker/path_with_commas.stdout
@@ -1,4 +1,4 @@
 Reading package info from "test.pkg" ... done.
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[1 of 2] Compiling Main             ( Main.hs, Main.o )
+[2 of 2] Linking Main
 hello
diff --git a/testsuite/tests/typecheck/should_fail/T13068.stderr b/testsuite/tests/typecheck/should_fail/T13068.stderr
index 6ecf1871c6..d78e402f76 100644
--- a/testsuite/tests/typecheck/should_fail/T13068.stderr
+++ b/testsuite/tests/typecheck/should_fail/T13068.stderr
@@ -1,5 +1,5 @@
-[1 of 4] Compiling T13068[boot]     ( T13068.hs-boot, T13068.o-boot )
-[2 of 4] Compiling T13068a          ( T13068a.hs, T13068a.o )
+[1 of 5] Compiling T13068[boot]     ( T13068.hs-boot, T13068.o-boot )
+[2 of 5] Compiling T13068a          ( T13068a.hs, T13068a.o )
 
 T13068a.hs:3:10: error:
     • Cannot define instance for abstract class ‘C’
diff --git a/testsuite/tests/typecheck/should_fail/T6018fail.stderr b/testsuite/tests/typecheck/should_fail/T6018fail.stderr
index 78a92e7d1b..ed1a8c3de2 100644
--- a/testsuite/tests/typecheck/should_fail/T6018fail.stderr
+++ b/testsuite/tests/typecheck/should_fail/T6018fail.stderr
@@ -1,8 +1,8 @@
-[1 of 5] Compiling T6018Afail       ( T6018Afail.hs, T6018Afail.o )
-[2 of 5] Compiling T6018Bfail       ( T6018Bfail.hs, T6018Bfail.o )
-[3 of 5] Compiling T6018Cfail       ( T6018Cfail.hs, T6018Cfail.o )
-[4 of 5] Compiling T6018Dfail       ( T6018Dfail.hs, T6018Dfail.o )
-[5 of 5] Compiling T6018fail        ( T6018fail.hs, T6018fail.o )
+[1 of 6] Compiling T6018Afail       ( T6018Afail.hs, T6018Afail.o )
+[2 of 6] Compiling T6018Bfail       ( T6018Bfail.hs, T6018Bfail.o )
+[3 of 6] Compiling T6018Cfail       ( T6018Cfail.hs, T6018Cfail.o )
+[4 of 6] Compiling T6018Dfail       ( T6018Dfail.hs, T6018Dfail.o )
+[5 of 6] Compiling T6018fail        ( T6018fail.hs, T6018fail.o )
 
 T6018fail.hs:15:15: error:
     Type family equation right-hand sides overlap; this violates
diff --git a/testsuite/tests/unboxedsums/module/sum_mod.stdout b/testsuite/tests/unboxedsums/module/sum_mod.stdout
index 615266b7f6..bf322a1137 100644
--- a/testsuite/tests/unboxedsums/module/sum_mod.stdout
+++ b/testsuite/tests/unboxedsums/module/sum_mod.stdout
@@ -1,3 +1,3 @@
-[2 of 2] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
+[2 of 3] Compiling Main             ( Main.hs, Main.o )
+[3 of 3] Linking Main
 123
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727a.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727a.stderr
index c77fbc4300..383b6df7bd 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727a.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727a.stderr
@@ -1,6 +1,7 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: M1
-[1 of 2] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 2] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-Linking src-exe/Main ...
+    Modules are not listed in command line but needed for compilation: 
+        M1
+[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 3] Linking src-exe/Main
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727b.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727b.stderr
index c77fbc4300..383b6df7bd 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727b.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727b.stderr
@@ -1,6 +1,7 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: M1
-[1 of 2] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 2] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-Linking src-exe/Main ...
+    Modules are not listed in command line but needed for compilation: 
+        M1
+[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 3] Linking src-exe/Main
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727c.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727c.stderr
index 0b9ac0ebf2..c9c968ddf3 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727c.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727c.stderr
@@ -1,3 +1,3 @@
-[1 of 2] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 2] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-Linking src-exe/Main ...
+[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 3] Linking src-exe/Main
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727d.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727d.stderr
index 0b9ac0ebf2..c9c968ddf3 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727d.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727d.stderr
@@ -1,3 +1,3 @@
-[1 of 2] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 2] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-Linking src-exe/Main ...
+[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 3] Linking src-exe/Main
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727e.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727e.stderr
index 0b9ac0ebf2..c9c968ddf3 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727e.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727e.stderr
@@ -1,3 +1,3 @@
-[1 of 2] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 2] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-Linking src-exe/Main ...
+[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 3] Linking src-exe/Main
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727f.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727f.stderr
index 20a42baeb9..9d084b94f6 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727f.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727f.stderr
@@ -1,8 +1,8 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: M1
-                                                                       Main
-[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-[3 of 3] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
-Linking src-exe/AltMain ...
+    Modules are not listed in command line but needed for compilation: 
+        M1 Main
+[1 of 4] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 4] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 4] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
+[4 of 4] Linking src-exe/AltMain
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727g.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727g.stderr
index 20a42baeb9..9d084b94f6 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727g.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727g.stderr
@@ -1,8 +1,8 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: M1
-                                                                       Main
-[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-[3 of 3] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
-Linking src-exe/AltMain ...
+    Modules are not listed in command line but needed for compilation: 
+        M1 Main
+[1 of 4] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 4] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 4] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
+[4 of 4] Linking src-exe/AltMain
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727h.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727h.stderr
index a29f764a47..b627f7eaf5 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727h.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727h.stderr
@@ -1,7 +1,8 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: M1
-[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-[3 of 3] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
-Linking src-exe/AltMain ...
+    Modules are not listed in command line but needed for compilation: 
+        M1
+[1 of 4] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 4] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 4] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
+[4 of 4] Linking src-exe/AltMain
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727i.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727i.stderr
index a29f764a47..b627f7eaf5 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727i.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727i.stderr
@@ -1,7 +1,8 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: M1
-[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-[3 of 3] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
-Linking src-exe/AltMain ...
+    Modules are not listed in command line but needed for compilation: 
+        M1
+[1 of 4] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 4] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 4] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
+[4 of 4] Linking src-exe/AltMain
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727j.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727j.stderr
index e85f778a56..685860db43 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727j.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727j.stderr
@@ -1,7 +1,8 @@
 
 <no location info>: warning: [-Wmissing-home-modules]
-    Modules are not listed in command line but needed for compilation: Main
-[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-[3 of 3] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
-Linking src-exe/AltMain ...
+    Modules are not listed in command line but needed for compilation: 
+        Main
+[1 of 4] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 4] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 4] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
+[4 of 4] Linking src-exe/AltMain
diff --git a/testsuite/tests/warnings/should_compile/T13727/T13727k.stderr b/testsuite/tests/warnings/should_compile/T13727/T13727k.stderr
index c648d9b593..3cfcf4bcac 100644
--- a/testsuite/tests/warnings/should_compile/T13727/T13727k.stderr
+++ b/testsuite/tests/warnings/should_compile/T13727/T13727k.stderr
@@ -1,4 +1,4 @@
-[1 of 3] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
-[2 of 3] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
-[3 of 3] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
-Linking src-exe/AltMain ...
+[1 of 4] Compiling M1               ( src-lib/M1.hs, src-lib/M1.o )
+[2 of 4] Compiling Main             ( src-exe/Main.hs, src-exe/Main.o )
+[3 of 4] Compiling AltMain          ( src-exe/AltMain.hs, src-exe/AltMain.o )
+[4 of 4] Linking src-exe/AltMain
diff --git a/testsuite/tests/warnings/should_compile/UnusedPackages.stderr b/testsuite/tests/warnings/should_compile/UnusedPackages.stderr
index ba6a76207f..11f87e6de4 100644
--- a/testsuite/tests/warnings/should_compile/UnusedPackages.stderr
+++ b/testsuite/tests/warnings/should_compile/UnusedPackages.stderr
@@ -5,5 +5,5 @@
       - ghc
       - process
       - bytestring
-[1 of 1] Compiling Main             ( UnusedPackages.hs, UnusedPackages.o )
-Linking UnusedPackages ...
+[1 of 2] Compiling Main             ( UnusedPackages.hs, UnusedPackages.o )
+[2 of 2] Linking UnusedPackages