Merge pull request #69363 from apple/egorzhdan/reenable-test-linux

egorzhdan · web-flow · commit a058e98f5730 · 2023-10-24T15:30:53.000+01:00
[cxx-interop] Enable an overlay test on Linux
diff --git a/test/Interop/Cxx/stdlib/overlay/custom-convertible-to-collection.swift b/test/Interop/Cxx/stdlib/overlay/custom-convertible-to-collection.swift
@@ -14,7 +14,6 @@ CxxSequenceTestSuite.test("SimpleSequence to Swift.Array") {
   expectEqual([1, 2, 3, 4] as [Int32], array)
 }
 
-#if !os(Linux) // this test crashes on Linux (https://github.com/apple/swift/issues/66363)
 CxxSequenceTestSuite.test("SimpleCopyAwareSequence to Swift.Array") {
   copiesCount = 0
 
@@ -23,7 +22,6 @@ CxxSequenceTestSuite.test("SimpleCopyAwareSequence to Swift.Array") {
 
   expectEqual(0, copiesCount) // make sure we don't copy the C++ sequence value unnecessarily
 }
-#endif
 
 CxxSequenceTestSuite.test("SimpleSequenceWithOutOfLineEqualEqual to Swift.Array") {
   let seq = SimpleSequenceWithOutOfLineEqualEqual()

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ CxxSequenceTestSuite.test("SimpleSequence to Swift.Array") {`
`14`	`14`	`expectEqual([1, 2, 3, 4] as [Int32], array)`
`15`	`15`	`}`
`16`	`16`
`17`		`-#if !os(Linux) // this test crashes on Linux (https://github.com/apple/swift/issues/66363)`
`18`	`17`	`CxxSequenceTestSuite.test("SimpleCopyAwareSequence to Swift.Array") {`
`19`	`18`	`copiesCount = 0`
`20`	`19`
`@@ -23,7 +22,6 @@ CxxSequenceTestSuite.test("SimpleCopyAwareSequence to Swift.Array") {`
`23`	`22`
`24`	`23`	`expectEqual(0, copiesCount) // make sure we don't copy the C++ sequence value unnecessarily`
`25`	`24`	`}`
`26`		`-#endif`
`27`	`25`
`28`	`26`	`CxxSequenceTestSuite.test("SimpleSequenceWithOutOfLineEqualEqual to Swift.Array") {`
`29`	`27`	`let seq = SimpleSequenceWithOutOfLineEqualEqual()`