Merge pull request #70074 from apple/egorzhdan/test-stdlib-with-upcoming-compat-pt2

egorzhdan · web-flow · commit 3bfd11687507 · 2023-11-29T01:55:28.000+01:00
[cxx-interop] Test more of stdlib with the upcoming compat version
diff --git a/test/Interop/Cxx/stdlib/avoid-import-cxx-math.swift b/test/Interop/Cxx/stdlib/avoid-import-cxx-math.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend %s -typecheck -verify -enable-experimental-cxx-interop -Xcc -std=c++17
+// RUN: %target-swift-frontend %s -typecheck -verify -cxx-interoperability-mode=upcoming-swift -Xcc -std=c++17
 
 // REQUIRES: OS=macosx || OS=linux-gnu
 
diff --git a/test/Interop/Cxx/stdlib/import-cxx-math-ambiguities.swift b/test/Interop/Cxx/stdlib/import-cxx-math-ambiguities.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend %s -typecheck -enable-experimental-cxx-interop -Xcc -std=c++17
+// RUN: %target-swift-frontend %s -typecheck -cxx-interoperability-mode=upcoming-swift -Xcc -std=c++17
 
 #if canImport(Foundation)
 // Foundation depends on C++ standard library
diff --git a/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-module-interface.swift b/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-module-interface.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=ConvertibleToBool -source-filename=x -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=ConvertibleToBool -source-filename=x -I %S/Inputs -cxx-interoperability-mode=upcoming-swift | %FileCheck %s
 
 // CHECK: struct BoolBox : CxxConvertibleToBool {
 // CHECK: }
diff --git a/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-typechecker.swift b/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-typechecker.swift
@@ -1,4 +1,5 @@
 // RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=upcoming-swift
 
 import ConvertibleToBool
 
diff --git a/test/Interop/Cxx/stdlib/overlay/convertible-to-bool.swift b/test/Interop/Cxx/stdlib/overlay/convertible-to-bool.swift
@@ -1,4 +1,5 @@
 // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
+// RUN: %target-run-simple-swift(-I %S/Inputs -cxx-interoperability-mode=upcoming-swift)
 
 // REQUIRES: executable_test
 
diff --git a/test/Interop/Cxx/stdlib/overlay/custom-collection-module-interface.swift b/test/Interop/Cxx/stdlib/overlay/custom-collection-module-interface.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=CustomSequence -source-filename=x -I %S/Inputs -enable-experimental-cxx-interop -module-cache-path %t | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=CustomSequence -source-filename=x -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -module-cache-path %t | %FileCheck %s
 
 // CHECK: struct SimpleArrayWrapper : CxxRandomAccessCollection {
 // CHECK:   typealias Element = UnsafePointer<Int32>.Pointee
diff --git a/test/Interop/Cxx/stdlib/overlay/custom-collection.swift b/test/Interop/Cxx/stdlib/overlay/custom-collection.swift
@@ -1,4 +1,5 @@
 // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
+// RUN: %target-run-simple-swift(-I %S/Inputs -cxx-interoperability-mode=upcoming-swift)
 //
 // REQUIRES: executable_test
 
diff --git a/test/Interop/Cxx/stdlib/overlay/custom-convertible-to-collection.swift b/test/Interop/Cxx/stdlib/overlay/custom-convertible-to-collection.swift
@@ -1,4 +1,5 @@
 // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
+// RUN: %target-run-simple-swift(-I %S/Inputs -cxx-interoperability-mode=upcoming-swift)
 //
 // REQUIRES: executable_test
 
diff --git a/test/Interop/Cxx/stdlib/overlay/custom-iterator-module-interface.swift b/test/Interop/Cxx/stdlib/overlay/custom-iterator-module-interface.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=CustomSequence -source-filename=x -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=CustomSequence -source-filename=x -I %S/Inputs -cxx-interoperability-mode=upcoming-swift | %FileCheck %s
 
 // CHECK: struct ConstIterator : UnsafeCxxInputIterator {
 // CHECK:   func successor() -> ConstIterator
diff --git a/test/Interop/Cxx/stdlib/overlay/custom-sequence-module-interface.swift b/test/Interop/Cxx/stdlib/overlay/custom-sequence-module-interface.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=CustomSequence -source-filename=x -I %S/Inputs -enable-experimental-cxx-interop -module-cache-path %t | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=CustomSequence -source-filename=x -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -module-cache-path %t | %FileCheck %s
 
 // CHECK: struct SimpleSequence : CxxConvertibleToCollection {
 // CHECK:   typealias Element = ConstIterator.Pointee
diff --git a/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift b/test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift
@@ -1,4 +1,5 @@
 // RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-cxx-interop)
+// RUN: %target-run-simple-swift(-I %S/Inputs -cxx-interoperability-mode=upcoming-swift)
 //
 // REQUIRES: executable_test
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// RUN: %target-swift-frontend %s -typecheck -verify -enable-experimental-cxx-interop -Xcc -std=c++17`
	`2`	`+// RUN: %target-swift-frontend %s -typecheck -verify -cxx-interoperability-mode=upcoming-swift -Xcc -std=c++17`
`2`	`3`
`3`	`4`	`// REQUIRES: OS=macosx \|\| OS=linux-gnu`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// RUN: %target-swift-ide-test -print-module -module-to-print=ConvertibleToBool -source-filename=x -I %S/Inputs -enable-experimental-cxx-interop \| %FileCheck %s`
	`2`	`+// RUN: %target-swift-ide-test -print-module -module-to-print=ConvertibleToBool -source-filename=x -I %S/Inputs -cxx-interoperability-mode=upcoming-swift \| %FileCheck %s`
`2`	`3`
`3`	`4`	`// CHECK: struct BoolBox : CxxConvertibleToBool {`
`4`	`5`	`// CHECK: }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop`
	`2`	`+// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=upcoming-swift`
`2`	`3`
`3`	`4`	`import ConvertibleToBool`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)`
	`2`	`+// RUN: %target-run-simple-swift(-I %S/Inputs -cxx-interoperability-mode=upcoming-swift)`
`2`	`3`
`3`	`4`	`// REQUIRES: executable_test`
`4`	`5`