From bb4cabb7214bf60fcfbeea8093787bde655a95aa Mon Sep 17 00:00:00 2001 From: "Henrik G. Olsson" Date: Wed, 8 Oct 2025 15:38:58 -0700 Subject: [PATCH 1/3] Revert "Merge pull request #84775 from slavapestov/disable-failing-tests-harder" This reverts commit 65419656ae5a90c10043709a89e4edfa25704ce7, reversing changes made to 537353074df5458b5150ab898eb6756063b7243a. --- test/Interop/Cxx/class/access/swiftify-private-fileid.swift | 2 +- test/Interop/Cxx/stdlib/std-span-transformed-execution.swift | 2 +- test/Interop/Cxx/stdlib/use-std-span-typechecker.swift | 2 +- test/Interop/Cxx/stdlib/use-std-span.swift | 2 +- .../Interop/Cxx/swiftify-import/import-as-instance-method.swift | 2 +- test/Interop/Cxx/swiftify-import/span-in-ctor.swift | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Interop/Cxx/class/access/swiftify-private-fileid.swift b/test/Interop/Cxx/class/access/swiftify-private-fileid.swift index 948f935554d1f..bd4e1de106c8d 100644 --- a/test/Interop/Cxx/class/access/swiftify-private-fileid.swift +++ b/test/Interop/Cxx/class/access/swiftify-private-fileid.swift @@ -1,4 +1,4 @@ -// REQUIRES: rdar162106643 +// REQUIRES: rdar://162106643 // RUN: rm -rf %t // RUN: split-file %s %t diff --git a/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift b/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift index 1b22a53f8e671..d1ea3dd629990 100644 --- a/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift +++ b/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift @@ -1,4 +1,4 @@ -// REQUIRES: rdar162106653 +// REQUIRES: rdar://162106653 // RUN: %target-run-simple-swift(-plugin-path %swift-plugin-dir -I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -swift-version 6 -Xfrontend -disable-availability-checking -Xcc -std=c++20 -enable-experimental-feature LifetimeDependence -enable-experimental-feature SafeInteropWrappers) diff --git a/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift b/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift index ba5d494ad0955..8bc6a28c70a5d 100644 --- a/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift +++ b/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift @@ -1,4 +1,4 @@ -// REQUIRES: rdar162106722 +// REQUIRES: rdar://162106722 // RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -Xcc -std=c++20 2>&1 diff --git a/test/Interop/Cxx/stdlib/use-std-span.swift b/test/Interop/Cxx/stdlib/use-std-span.swift index 37a817c027cfa..2dd6fe9273c9a 100644 --- a/test/Interop/Cxx/stdlib/use-std-span.swift +++ b/test/Interop/Cxx/stdlib/use-std-span.swift @@ -1,4 +1,4 @@ -// REQUIRES: rdar162106580 +// REQUIRES: rdar://162106580 // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++20) // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++20 -Xcc -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG) diff --git a/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift b/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift index c2e9d579bab79..1f19956e56f02 100644 --- a/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift +++ b/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift @@ -1,4 +1,4 @@ -// REQUIRES: rdar162106619 +// REQUIRES: rdar://162106619 // REQUIRES: swift_feature_SafeInteropWrappers diff --git a/test/Interop/Cxx/swiftify-import/span-in-ctor.swift b/test/Interop/Cxx/swiftify-import/span-in-ctor.swift index e09bcdd2a276f..cd29b618c3376 100644 --- a/test/Interop/Cxx/swiftify-import/span-in-ctor.swift +++ b/test/Interop/Cxx/swiftify-import/span-in-ctor.swift @@ -1,4 +1,4 @@ -// REQUIRES: rdar162106747 +// REQUIRES: rdar://162106747 // REQUIRES: swift_feature_SafeInteropWrappers From f8a7e8f4b9cce65f7b54576f83d7c83184659bc5 Mon Sep 17 00:00:00 2001 From: "Henrik G. Olsson" Date: Wed, 8 Oct 2025 15:13:12 -0700 Subject: [PATCH 2/3] Revert "Merge pull request #84769 from Azoy/disable-some-tests" This reverts commit fe525539e531736997b1c7a727029d828c5661b4, reversing changes made to 5e325632ed7659c9fec68c37793eb5bda026af35. --- test/Interop/Cxx/class/access/swiftify-private-fileid.swift | 2 -- test/Interop/Cxx/stdlib/std-span-transformed-execution.swift | 2 -- test/Interop/Cxx/stdlib/use-std-span-typechecker.swift | 2 -- test/Interop/Cxx/stdlib/use-std-span.swift | 2 -- .../Interop/Cxx/swiftify-import/import-as-instance-method.swift | 2 -- test/Interop/Cxx/swiftify-import/span-in-ctor.swift | 2 -- 6 files changed, 12 deletions(-) diff --git a/test/Interop/Cxx/class/access/swiftify-private-fileid.swift b/test/Interop/Cxx/class/access/swiftify-private-fileid.swift index bd4e1de106c8d..cd12684535fd3 100644 --- a/test/Interop/Cxx/class/access/swiftify-private-fileid.swift +++ b/test/Interop/Cxx/class/access/swiftify-private-fileid.swift @@ -1,5 +1,3 @@ -// REQUIRES: rdar://162106643 - // RUN: rm -rf %t // RUN: split-file %s %t diff --git a/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift b/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift index d1ea3dd629990..aac46b5afa75b 100644 --- a/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift +++ b/test/Interop/Cxx/stdlib/std-span-transformed-execution.swift @@ -1,5 +1,3 @@ -// REQUIRES: rdar://162106653 - // RUN: %target-run-simple-swift(-plugin-path %swift-plugin-dir -I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -swift-version 6 -Xfrontend -disable-availability-checking -Xcc -std=c++20 -enable-experimental-feature LifetimeDependence -enable-experimental-feature SafeInteropWrappers) // TODO: test failed in Windows PR testing: rdar://144384453 diff --git a/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift b/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift index 8bc6a28c70a5d..98ad28fac487e 100644 --- a/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift +++ b/test/Interop/Cxx/stdlib/use-std-span-typechecker.swift @@ -1,5 +1,3 @@ -// REQUIRES: rdar://162106722 - // RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -Xcc -std=c++20 2>&1 import StdSpan diff --git a/test/Interop/Cxx/stdlib/use-std-span.swift b/test/Interop/Cxx/stdlib/use-std-span.swift index 2dd6fe9273c9a..478be72399651 100644 --- a/test/Interop/Cxx/stdlib/use-std-span.swift +++ b/test/Interop/Cxx/stdlib/use-std-span.swift @@ -1,5 +1,3 @@ -// REQUIRES: rdar://162106580 - // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++20) // RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++20 -Xcc -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG) diff --git a/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift b/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift index 1f19956e56f02..b9406f0d3e0d8 100644 --- a/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift +++ b/test/Interop/Cxx/swiftify-import/import-as-instance-method.swift @@ -1,5 +1,3 @@ -// REQUIRES: rdar://162106619 - // REQUIRES: swift_feature_SafeInteropWrappers // RUN: %empty-directory(%t) diff --git a/test/Interop/Cxx/swiftify-import/span-in-ctor.swift b/test/Interop/Cxx/swiftify-import/span-in-ctor.swift index cd29b618c3376..d138152bb06b1 100644 --- a/test/Interop/Cxx/swiftify-import/span-in-ctor.swift +++ b/test/Interop/Cxx/swiftify-import/span-in-ctor.swift @@ -1,5 +1,3 @@ -// REQUIRES: rdar://162106747 - // REQUIRES: swift_feature_SafeInteropWrappers // RUN: rm -rf %t From d7ecac7998b57a328e74c1a451eaacebef39979b Mon Sep 17 00:00:00 2001 From: "Henrik G. Olsson" Date: Wed, 8 Oct 2025 23:37:10 -0700 Subject: [PATCH 3/3] reenable test --- test/Interop/CxxToSwiftToCxx/span/span-execution.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/Interop/CxxToSwiftToCxx/span/span-execution.cpp b/test/Interop/CxxToSwiftToCxx/span/span-execution.cpp index 839e89ba38eb6..d087c08d4a463 100644 --- a/test/Interop/CxxToSwiftToCxx/span/span-execution.cpp +++ b/test/Interop/CxxToSwiftToCxx/span/span-execution.cpp @@ -11,8 +11,6 @@ // REQUIRES: executable_test -// REQUIRES: OS=macosx || rdar-161999258 - //--- header.h #include #include