       "propagating into 2nd wave",
       checkDiagnostics: checkDiagnostics,
       expectingRemarks: [
-        "Incremental compilation: Scheduing changed input {compile: main.o <= main.swift}",
-        "Incremental compilation: May skip current input: {compile: other.o <= other.swift}",
-        "Incremental compilation: Queuing (initial): {compile: main.o <= main.swift}",
+        "Incremental compilation: Scheduing changed input  {compile: main.o <= main.swift}",
+        "Incremental compilation: May skip current input:  {compile: other.o <= other.swift}",
+        "Incremental compilation: Queuing (initial):  {compile: main.o <= main.swift}",
         "Incremental compilation: not scheduling dependents of main.swift; unknown changes",
-        "Incremental compilation: Skipping input: {compile: other.o <= other.swift}",
+        "Incremental compilation: Skipping input:  {compile: other.o <= other.swift}",
         "Found 1 batchable job",
         "Forming into 1 batch",
         "Adding {compile: main.swift} to batch 0",
         "Forming batch job from 1 constituents: main.swift",
         "Starting Compiling main.swift",
-        "Incremental compilation: Traced: interface of source file 'main.swiftdeps' from: main.swift -> interface of top-level name 'foo' from: main.swift -> implementation of source file 'other.swiftdeps' from: other.swift",
-        "Incremental compilation: Queuing because of dependencies discovered later: {compile: other.o <= other.swift}",
-        "Incremental compilation: Scheduling discovered {compile: other.o <= other.swift}",
+        "Finished Compiling main.swift",
+        "Incremental compilation: Traced: interface of source file main.swiftdeps in main.swift -> interface of top-level name 'foo' in main.swift -> implementation of source file other.swiftdeps in other.swift",
+        "Incremental compilation: Queuing because of dependencies discovered later:  {compile: other.o <= other.swift}",
+        "Incremental compilation: Scheduling discovered  {compile: other.o <= other.swift}",
         "Found 1 batchable job",
         "Forming into 1 batch",
         "Adding {compile: other.swift} to batch 0",
         "Forming batch job from 1 constituents: other.swift",
-        "Finished Compiling main.swift",
         "Starting Compiling other.swift",
         "Finished Compiling other.swift",
         "Starting Linking theModule",

      "non-propagating, both touched",
      checkDiagnostics: checkDiagnostics,
      expectingRemarks: [
        "Incremental compilation: Scheduing changed input {compile: main.o <= main.swift}",
        "Incremental compilation: Scheduing changed input {compile: other.o <= other.swift}",
        "Incremental compilation: Queuing (initial): {compile: main.o <= main.swift}",
        "Incremental compilation: Queuing (initial): {compile: other.o <= other.swift}",
        "Incremental compilation: not scheduling dependents of main.swift; unknown changes",
        "Incremental compilation: not scheduling dependents of other.swift; unknown changes",
        "Found 2 batchable jobs",

        // Leave off the part after the colon because it varies on Linux:
        // MacOS: The operation could not be completed. (TSCBasic.FileSystemError error 3.).
        // Linux: The operation couldn’t be completed. (TSCBasic.FileSystemError error 3.)
        "Incremental compilation: Incremental compilation could not read build record at",
        "Incremental compilation: Disabling incremental build: could not read build record",
        "Found 2 batchable jobs",
        "Forming into 1 batch",
        "Adding {compile: main.swift} to batch 0",
