Merge pull request #18106 from huonw/fix-tbd-multi-file

Author: swift-ci

test/TBD/Inputs/multi-file-nonresilient-expected.tbd

@@ -5,40 +5,36 @@
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -wmo -Xfrontend -validate-tbd-against-ir=all
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -Xfrontend -validate-tbd-against-ir=all
 
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-nonresilient-expected.tbd
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-nonresilient-expected.tbd
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-wmo.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-incremental.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift
+// RUN: diff %t/TBD-wmo.tbd %t/TBD-incremental.tbd
 
 // -O, non-resilient
 
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -wmo -O -Xfrontend -validate-tbd-against-ir=all
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -O -Xfrontend -validate-tbd-against-ir=all
 
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo -O
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-nonresilient-expected.tbd
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -O
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-nonresilient-expected.tbd
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-wmo.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo -O
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-incremental.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -O
+// RUN: diff %t/TBD-wmo.tbd %t/TBD-incremental.tbd
 
 // -Onone, resilient
 
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -wmo -Xfrontend -enable-resilience -Xfrontend -validate-tbd-against-ir=all
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -Xfrontend -enable-resilience -Xfrontend -validate-tbd-against-ir=all
 
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo -Xfrontend -enable-resilience
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-resilient-expected.tbd
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -Xfrontend -enable-resilience
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-resilient-expected.tbd
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-wmo.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo -Xfrontend -enable-resilience
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-incremental.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -Xfrontend -enable-resilience
+// RUN: diff %t/TBD-wmo.tbd %t/TBD-incremental.tbd
 
 // -O, resilient
 
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -wmo -O -Xfrontend -enable-resilience -Xfrontend -validate-tbd-against-ir=all
 // RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-library -o %t/JustForTBDValidation %s %S/Inputs/multi-file2.swift -O -Xfrontend -enable-resilience -Xfrontend -validate-tbd-against-ir=all
 
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo -O -Xfrontend -enable-resilience
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-resilient-expected.tbd
-// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -O -Xfrontend -enable-resilience
-// RUN: diff %t/TBD.tbd %S/Inputs/multi-file-resilient-expected.tbd
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-wmo.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -wmo -O -Xfrontend -enable-resilience
+// RUN: %target-build-swift -swift-version 4 -module-name multifile -emit-tbd-path %t/TBD-incremental.tbd -emit-module-path %t/multifile.swiftmodule %s %S/Inputs/multi-file2.swift -O -Xfrontend -enable-resilience
+// RUN: diff %t/TBD-wmo.tbd %t/TBD-incremental.tbd
 
 // REQUIRES: objc_interop