Merge pull request #84774 from hnrklssn/fix-std-span-linux

Fix std::span tests on linux

Author: hnrklssn

test/Interop/Cxx/class/access/swiftify-private-fileid.swift

@@ -1,11 +1,10 @@
-// REQUIRES: rdar162106643
-
 // RUN: rm -rf %t
 // RUN: split-file %s %t
 
 // RUN: %target-swift-frontend -emit-ir -I %swift_src_root/lib/ClangImporter/SwiftBridging -plugin-path %swift-plugin-dir %t/blessed.swift -module-name main -I %t/Inputs -o %t/out -Xcc -std=c++20  -cxx-interoperability-mode=default -enable-experimental-feature SafeInteropWrappers -verify
 
 // REQUIRES: swift_feature_SafeInteropWrappers
+// REQUIRES: std_span
 
 //--- Inputs/swiftify-non-public.h
 #pragma once

test/Interop/Cxx/class/safe-interop-mode.swift

@@ -5,6 +5,7 @@
 
 // REQUIRES: objc_interop
 // REQUIRES: swift_feature_LifetimeDependence
+// REQUIRES: std_span
 
 //--- Inputs/module.modulemap
 module Test {

test/Interop/Cxx/stdlib/std-span-interface.swift

@@ -7,7 +7,7 @@
 
 // REQUIRES: swift_feature_SafeInteropWrappers
 // REQUIRES: swift_feature_Lifetimes
-// REQUIRES: rdar161999174
+// REQUIRES: std_span
 
 #if !BRIDGING_HEADER
 import StdSpan

test/Interop/Cxx/stdlib/std-span-transformed-execution.swift

@@ -1,5 +1,3 @@
-// REQUIRES: rdar162106653
-
 // 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
@@ -9,6 +7,7 @@
 // REQUIRES: swift_feature_LifetimeDependence
 
 // REQUIRES: executable_test
+// REQUIRES: std_span
 
 #if !BRIDGING_HEADER
 import StdSpan

test/Interop/Cxx/stdlib/use-std-span-typechecker.swift

@@ -1,6 +1,5 @@
-// REQUIRES: rdar162106722
-
 // RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -Xcc -std=c++20 2>&1
+// REQUIRES: std_span
 
 import StdSpan
 

test/Interop/Cxx/stdlib/use-std-span.swift

@@ -1,12 +1,14 @@
-// REQUIRES: rdar162106580
-
 // 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)
 
 // TODO: test failed in Windows PR testing: rdar://144384453
 // UNSUPPORTED: OS=windows-msvc
 
+// TODO: test failed in macOS PR testing but passes locally: rdar://163049442
+// UNSUPPORTED: OS=macosx
+
 // REQUIRES: executable_test
+// REQUIRES: std_span
 
 import StdlibUnittest
 #if !BRIDGING_HEADER

test/Interop/Cxx/swiftify-import/import-as-instance-method.swift

@@ -1,6 +1,5 @@
-// REQUIRES: rdar162106619
-
 // REQUIRES: swift_feature_SafeInteropWrappers
+// REQUIRES: std_span
 
 // RUN: %empty-directory(%t)
 // RUN: split-file %s %t

test/Interop/Cxx/swiftify-import/span-in-ctor.swift

@@ -1,6 +1,5 @@
-// REQUIRES: rdar162106747
-
 // REQUIRES: swift_feature_SafeInteropWrappers
+// REQUIRES: std_span
 
 // RUN: rm -rf %t
 // RUN: split-file %s %t

test/Interop/CxxToSwiftToCxx/span/span-execution.cpp

@@ -10,10 +10,10 @@
 // RUN: %target-run %t/swift-cxx-execution | %FileCheck %s
 
 // REQUIRES: executable_test
-
-// REQUIRES: OS=macosx || rdar-161999258
+// REQUIRES: std_span
 
 //--- header.h
+#include <cstdint>
 #include <string>
 #include <span>
 

test/Interop/lit.local.cfg

@@ -48,6 +48,24 @@ if get_target_os() in ['linux-gnu']:
     if os.path.exists('/usr/include/c++/v1') or os.path.exists('/usr/local/include/c++/v1'):
         config.available_features.add('system_wide_libcxx')
 
+if config.target_sdk_libcxx_path != '':
+    if os.path.exists(os.path.join(config.target_sdk_libcxx_path, "span")):
+        config.available_features.add('std_span')
+elif get_target_os() in ['linux-gnu']:
+    for p in ['/usr/include/c++/', '/usr/local/include/c++/']:
+        if not os.path.isdir(p):
+            continue
+        for subdir in os.listdir(p):
+            if not subdir.isdigit():
+                # skip paths libc++ paths like /usr/include/c++/v1, we want libstdc++ paths only (like /usr/include/c++/13)
+                continue
+            if os.path.exists(os.path.join(p, subdir, "span")):
+                config.available_features.add('std_span')
+elif get_target_os() in ['windows-msvc']:
+    # We don't test on any versions of MSVC without std::span support.
+    # FIXME: figure out where to do lookup for C++ stdlib headers on Windows - we'll probably need it eventually
+    config.available_features.add('std_span')
+
 # Enable C++ interop when compiling Swift sources.
 config.substitutions.insert(0, ('%target-interop-build-swift',
                                 '%target-build-swift -cxx-interoperability-mode=default '))