diff --git a/test/TBD/Inputs/multi-file-nonresilient-expected.tbd b/test/TBD/Inputs/multi-file-nonresilient-expected.tbd deleted file mode 100644 index 9f0d77bf0a85c..0000000000000 --- a/test/TBD/Inputs/multi-file-nonresilient-expected.tbd +++ /dev/null @@ -1,28 +0,0 @@ -$S9multifile5ClassC10staticFunc8default_ySi_tFZ -$S9multifile5ClassC8propertySivg -$S9multifile5ClassC8propertySivm -$S9multifile5ClassC8propertySivpWvd -$S9multifile5ClassC8propertySivs -$S9multifile5ClassCACycfC -$S9multifile5ClassCACycfc -$S9multifile5ClassCMa -$S9multifile5ClassCMm -$S9multifile5ClassCMn -$S9multifile5ClassCN -$S9multifile5ClassCfD -$S9multifile5ClassCfd -$S9multifile6Class2C10staticFunc8default_ySi_tFZ -$S9multifile6Class2C8propertySivg -$S9multifile6Class2C8propertySivm -$S9multifile6Class2C8propertySivpWvd -$S9multifile6Class2C8propertySivs -$S9multifile6Class2CACycfC -$S9multifile6Class2CACycfc -$S9multifile6Class2CMa -$S9multifile6Class2CMm -$S9multifile6Class2CMn -$S9multifile6Class2CN -$S9multifile6Class2CfD -$S9multifile6Class2Cfd -$S9multifile8functionyyF -$S9multifile9function2yyF diff --git a/test/TBD/Inputs/multi-file-resilient-expected.tbd b/test/TBD/Inputs/multi-file-resilient-expected.tbd deleted file mode 100644 index ddedcc05b3f87..0000000000000 --- a/test/TBD/Inputs/multi-file-resilient-expected.tbd +++ /dev/null @@ -1,36 +0,0 @@ -$S9multifile5ClassC10staticFunc8default_ySi_tFZ -$S9multifile5ClassC8propertySivg -$S9multifile5ClassC8propertySivgTj -$S9multifile5ClassC8propertySivm -$S9multifile5ClassC8propertySivmTj -$S9multifile5ClassC8propertySivs -$S9multifile5ClassC8propertySivsTj -$S9multifile5ClassCACycfC -$S9multifile5ClassCACycfc -$S9multifile5ClassCACycfcTj -$S9multifile5ClassCMa -$S9multifile5ClassCMm -$S9multifile5ClassCMn -$S9multifile5ClassCMo -$S9multifile5ClassCN -$S9multifile5ClassCfD -$S9multifile5ClassCfd -$S9multifile6Class2C10staticFunc8default_ySi_tFZ -$S9multifile6Class2C8propertySivg -$S9multifile6Class2C8propertySivgTj -$S9multifile6Class2C8propertySivm -$S9multifile6Class2C8propertySivmTj -$S9multifile6Class2C8propertySivs -$S9multifile6Class2C8propertySivsTj -$S9multifile6Class2CACycfC -$S9multifile6Class2CACycfc -$S9multifile6Class2CACycfcTj -$S9multifile6Class2CMa -$S9multifile6Class2CMm -$S9multifile6Class2CMn -$S9multifile6Class2CMo -$S9multifile6Class2CN -$S9multifile6Class2CfD -$S9multifile6Class2Cfd -$S9multifile8functionyyF -$S9multifile9function2yyF diff --git a/test/TBD/multi-file.swift b/test/TBD/multi-file.swift index 329dbb0c05330..8061badd6c917 100644 --- a/test/TBD/multi-file.swift +++ b/test/TBD/multi-file.swift @@ -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