         // 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.)
-        "Disabling incremental build: could not read build record at",
+        "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",

      "no-change",
      checkDiagnostics: checkDiagnostics,
      expectingRemarks: [
        "Incremental compilation: May skip current input: {compile: main.o <= main.swift}",
        "Incremental compilation: May skip current input: {compile: other.o <= other.swift}",
        "Incremental compilation: Skipping input: {compile: main.o <= main.swift}",
        "Incremental compilation: Skipping input: {compile: other.o <= other.swift}",
      ],
      whenAutolinking: [])
  }

      "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",
