From c163e0fe5e3167c0c99e40d011833ee17470d87c Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Wed, 18 May 2022 17:16:51 -0700 Subject: [PATCH] [Tests] Make OS features consistent lit.py currently allows any substring of `target_triple` to be used as a feature in REQUIRES/UNSUPPORTED/XFAIL. This results in various forms of the OS spread across the tests and is also somewhat confusing since they aren't actually listed in the available features. Modify all OS-related features to use the `OS=` version that Swift adds instead. We can later remove `config.target_triple` so that these don't the non-OS versions don't work in the first place. --- ...nested-differentiation-of-extension-method-optimized.swift | 2 +- test/Concurrency/Reflection/reflect_task.swift | 2 +- .../Runtime/async_taskgroup_asynciterator_semantics.swift | 2 +- .../Runtime/async_taskgroup_is_asyncsequence.swift | 2 +- test/Concurrency/Runtime/executor_deinit1.swift | 2 +- test/DebugInfo/local-vars.swift.gyb | 2 +- ...ule_final_class_adhoc_requirement_not_optimized_away.swift | 2 +- test/Distributed/Runtime/distributed_actor_deinit.swift | 2 +- .../distributed_actor_func_calls_remoteCall_echo.swift | 2 +- .../distributed_actor_func_calls_remoteCall_empty.swift | 2 +- .../distributed_actor_func_calls_remoteCall_genericFunc.swift | 2 +- .../distributed_actor_func_calls_remoteCall_hello.swift | 2 +- .../distributed_actor_func_calls_remoteCall_take.swift | 2 +- ...tributed_actor_func_calls_remoteCall_takeThrowReturn.swift | 2 +- .../distributed_actor_func_calls_remoteCall_take_two.swift | 2 +- .../distributed_actor_func_calls_remoteCall_throw.swift | 2 +- test/Distributed/Runtime/distributed_actor_hop_to.swift | 2 +- .../Runtime/distributed_actor_in_other_module.swift | 2 +- test/Distributed/Runtime/distributed_actor_remoteCall.swift | 2 +- ...ributed_actor_remoteCallTarget_demanglingTargetNames.swift | 2 +- .../Runtime/distributed_actor_remoteCall_roundtrip.swift | 2 +- test/Distributed/Runtime/distributed_actor_whenLocal.swift | 2 +- test/Driver/Dependencies/embed-bitcode-parallel-fine.swift | 2 +- test/Driver/Dependencies/one-way-parallel-fine.swift | 2 +- test/Driver/Dependencies/only-skip-once.swift | 2 +- test/Driver/batch_mode_bridging_pch.swift | 1 - test/Driver/environment.swift | 2 +- test/Driver/filelists.swift | 2 +- test/Driver/frontend.swift | 2 +- test/Driver/fuzzer.swift | 2 +- test/Driver/loaded_module_trace_nocrash.swift | 2 +- test/Driver/loaded_module_trace_swiftinterface.swift | 2 +- test/Driver/macabi-environment.swift | 2 +- test/Driver/parseable_output.swift | 2 +- test/Driver/parseable_output_unicode.swift | 2 +- test/Driver/pipe_round_robin.swift.gyb | 2 +- test/Driver/sdk-apple.swift | 2 +- test/IDE/print_clang_header_i386.swift | 2 +- test/IRGen/abitypes.swift | 2 +- test/Interpreter/shebang-direct.swift | 2 +- test/ModuleInterface/BadStdlib.swiftinterface | 2 +- .../swift_build_sdk_interfaces/compiler-crash.test-sh | 2 +- test/Prototypes/CollectionTransformers.swift | 2 +- test/Reflection/box_descriptors.sil | 4 ++-- test/Reflection/capture_descriptors.sil | 2 +- test/Reflection/conformance_descriptors.swift | 2 +- test/Reflection/typeref_decoding_imported.swift | 2 +- test/SILOptimizer/addr_escape_info.sil | 2 +- test/SILOptimizer/escape_info.sil | 2 +- test/SILOptimizer/no-external-defs-onone.sil | 2 +- test/SILOptimizer/ranges.sil | 2 +- test/Sanitizers/asan/recover.swift | 2 +- test/Sanitizers/tsan/actor_counters.swift | 4 ++-- test/Sanitizers/tsan/objc_async.swift | 4 ++-- test/decl/result_builder_fixits.swift | 2 +- test/multifile/protocol-conformance-redundant.swift | 2 +- test/stdlib/simd_diagnostics.swift | 2 +- validation-test/SILOptimizer/large_string_array.swift.gyb | 2 +- .../Sema/type_checker_perf/fast/rdar23620262.swift | 2 +- .../Sema/type_checker_perf/fast/rdar54580427.swift | 2 +- validation-test/execution/dsohandle-multi-module.swift | 2 +- validation-test/stdlib/SIMDParameterPassing.swift.gyb | 2 +- 62 files changed, 64 insertions(+), 65 deletions(-) diff --git a/test/AutoDiff/compiler_crashers_fixed/rdar71191415-nested-differentiation-of-extension-method-optimized.swift b/test/AutoDiff/compiler_crashers_fixed/rdar71191415-nested-differentiation-of-extension-method-optimized.swift index 7a8a5f5ce8fc2..2aac3e1a58adc 100644 --- a/test/AutoDiff/compiler_crashers_fixed/rdar71191415-nested-differentiation-of-extension-method-optimized.swift +++ b/test/AutoDiff/compiler_crashers_fixed/rdar71191415-nested-differentiation-of-extension-method-optimized.swift @@ -1,7 +1,7 @@ // RUN: %target-build-swift -O %s // FIXME(rdar://89055298) -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu // rdar://71191415 diff --git a/test/Concurrency/Reflection/reflect_task.swift b/test/Concurrency/Reflection/reflect_task.swift index 97267593888ea..9101fe70a174b 100644 --- a/test/Concurrency/Reflection/reflect_task.swift +++ b/test/Concurrency/Reflection/reflect_task.swift @@ -10,7 +10,7 @@ // UNSUPPORTED: use_os_stdlib // UNSUPPORTED: back_deployment_runtime // -// UNSUPPORTED: OS=macosx,ios,watchos,tvos +// UNSUPPORTED: OS=macosx, OS=ios, OS=watchos, OS=tvos import Swift import _Concurrency diff --git a/test/Concurrency/Runtime/async_taskgroup_asynciterator_semantics.swift b/test/Concurrency/Runtime/async_taskgroup_asynciterator_semantics.swift index c12695aa359cd..a2961f5da8394 100644 --- a/test/Concurrency/Runtime/async_taskgroup_asynciterator_semantics.swift +++ b/test/Concurrency/Runtime/async_taskgroup_asynciterator_semantics.swift @@ -3,7 +3,7 @@ // REQUIRES: concurrency // REQUIRES: concurrency_runtime // UNSUPPORTED: back_deployment_runtime -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu // REQUIRES: rdar86028226 diff --git a/test/Concurrency/Runtime/async_taskgroup_is_asyncsequence.swift b/test/Concurrency/Runtime/async_taskgroup_is_asyncsequence.swift index 8f036a0023a82..5ec0e92fc874f 100644 --- a/test/Concurrency/Runtime/async_taskgroup_is_asyncsequence.swift +++ b/test/Concurrency/Runtime/async_taskgroup_is_asyncsequence.swift @@ -7,7 +7,7 @@ // REQUIRES: concurrency_runtime // UNSUPPORTED: back_deployment_runtime -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu @available(SwiftStdlib 5.1, *) func test_taskGroup_is_asyncSequence() async { diff --git a/test/Concurrency/Runtime/executor_deinit1.swift b/test/Concurrency/Runtime/executor_deinit1.swift index a5f04ec1db5e7..904defa6bbea8 100644 --- a/test/Concurrency/Runtime/executor_deinit1.swift +++ b/test/Concurrency/Runtime/executor_deinit1.swift @@ -7,7 +7,7 @@ // UNSUPPORTED: back_deployment_runtime // https://bugs.swift.org/browse/SR-14461 -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu // REQUIRES: rdar78325660 diff --git a/test/DebugInfo/local-vars.swift.gyb b/test/DebugInfo/local-vars.swift.gyb index 082d967215109..c13f46fa0a451 100644 --- a/test/DebugInfo/local-vars.swift.gyb +++ b/test/DebugInfo/local-vars.swift.gyb @@ -3,7 +3,7 @@ // all. There are other tests testing liveness and representation. // rdar://problem/57611302 -// XFAIL: windows +// XFAIL: OS=windows-msvc // RUN: %gyb %s -o %t.swift // RUN: %target-swift-frontend %t.swift -g -emit-ir -o - | %FileCheck %t.swift diff --git a/test/Distributed/Runtime/distributed_actor_cross_module_final_class_adhoc_requirement_not_optimized_away.swift b/test/Distributed/Runtime/distributed_actor_cross_module_final_class_adhoc_requirement_not_optimized_away.swift index 03767a199b30d..e685e70719453 100644 --- a/test/Distributed/Runtime/distributed_actor_cross_module_final_class_adhoc_requirement_not_optimized_away.swift +++ b/test/Distributed/Runtime/distributed_actor_cross_module_final_class_adhoc_requirement_not_optimized_away.swift @@ -13,7 +13,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_deinit.swift b/test/Distributed/Runtime/distributed_actor_deinit.swift index 5a4d79f53ced8..e781c5e0a80fe 100644 --- a/test/Distributed/Runtime/distributed_actor_deinit.swift +++ b/test/Distributed/Runtime/distributed_actor_deinit.swift @@ -8,7 +8,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift index 8b26af2a09be3..bbcad0d4740d7 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_echo.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift index b3cf476d23876..11e6de63d7141 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_empty.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift index 23c778ca5524e..7ff6dcb0e9b02 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_genericFunc.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift index e3be138706354..c3bf701bc94b3 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_hello.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift index 2857b2dbe605f..e8d9c58600d05 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift index 271ed8c2c65b2..1073ba2a84d41 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_takeThrowReturn.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift index 201d2794ea812..435582b86f4d9 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_take_two.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift index c051b3e28f95e..a2664a6970a5d 100644 --- a/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift +++ b/test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_throw.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_hop_to.swift b/test/Distributed/Runtime/distributed_actor_hop_to.swift index 4d977f274ea2c..54186c8828011 100644 --- a/test/Distributed/Runtime/distributed_actor_hop_to.swift +++ b/test/Distributed/Runtime/distributed_actor_hop_to.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed diff --git a/test/Distributed/Runtime/distributed_actor_in_other_module.swift b/test/Distributed/Runtime/distributed_actor_in_other_module.swift index 21c545caccf2a..785b6d8d9285f 100644 --- a/test/Distributed/Runtime/distributed_actor_in_other_module.swift +++ b/test/Distributed/Runtime/distributed_actor_in_other_module.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // REQUIRES: rdar92277324 diff --git a/test/Distributed/Runtime/distributed_actor_remoteCall.swift b/test/Distributed/Runtime/distributed_actor_remoteCall.swift index d339aa6ad29e9..3f6dbeb06fd74 100644 --- a/test/Distributed/Runtime/distributed_actor_remoteCall.swift +++ b/test/Distributed/Runtime/distributed_actor_remoteCall.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed diff --git a/test/Distributed/Runtime/distributed_actor_remoteCallTarget_demanglingTargetNames.swift b/test/Distributed/Runtime/distributed_actor_remoteCallTarget_demanglingTargetNames.swift index 26f626d44d527..7f705dae84100 100644 --- a/test/Distributed/Runtime/distributed_actor_remoteCallTarget_demanglingTargetNames.swift +++ b/test/Distributed/Runtime/distributed_actor_remoteCallTarget_demanglingTargetNames.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip.swift b/test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip.swift index 8302d69a152da..cd3b03c60ee8b 100644 --- a/test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip.swift +++ b/test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip.swift @@ -14,7 +14,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed import FakeDistributedActorSystems diff --git a/test/Distributed/Runtime/distributed_actor_whenLocal.swift b/test/Distributed/Runtime/distributed_actor_whenLocal.swift index f474ed9b1e353..67c09e85af7f4 100644 --- a/test/Distributed/Runtime/distributed_actor_whenLocal.swift +++ b/test/Distributed/Runtime/distributed_actor_whenLocal.swift @@ -12,7 +12,7 @@ // UNSUPPORTED: back_deployment_runtime // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc import Distributed diff --git a/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift b/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift index 8de4fb11423cb..4f61676a7e854 100644 --- a/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift +++ b/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift @@ -1,5 +1,5 @@ // Windows doesn't support parallel execution yet -// XFAIL: windows +// XFAIL: OS=windows-msvc // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* diff --git a/test/Driver/Dependencies/one-way-parallel-fine.swift b/test/Driver/Dependencies/one-way-parallel-fine.swift index 5f30a6377af69..a6a47f1a14328 100644 --- a/test/Driver/Dependencies/one-way-parallel-fine.swift +++ b/test/Driver/Dependencies/one-way-parallel-fine.swift @@ -1,5 +1,5 @@ // Windows doesn't support parallel execution yet -// XFAIL: windows +// XFAIL: OS=windows-msvc // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* diff --git a/test/Driver/Dependencies/only-skip-once.swift b/test/Driver/Dependencies/only-skip-once.swift index 314c29f752b14..a710f20bfa3eb 100644 --- a/test/Driver/Dependencies/only-skip-once.swift +++ b/test/Driver/Dependencies/only-skip-once.swift @@ -1,4 +1,4 @@ -// XFAIL: linux, openbsd, windows +// XFAIL: OS=linux-gnu, OS=openbsd, OS=windows-msvc // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/only-skip-once/* %t diff --git a/test/Driver/batch_mode_bridging_pch.swift b/test/Driver/batch_mode_bridging_pch.swift index 4100a01ffb7c1..f55c4eac2c7b8 100644 --- a/test/Driver/batch_mode_bridging_pch.swift +++ b/test/Driver/batch_mode_bridging_pch.swift @@ -1,4 +1,3 @@ -// XFAIL: win32 // RUN: %empty-directory(%t) // RUN: touch %t/file-01.swift %t/file-02.swift %t/file-03.swift // RUN: echo 'public func main() {}' >%t/main.swift diff --git a/test/Driver/environment.swift b/test/Driver/environment.swift index e8ec6d1cbfd2d..62d625ab30496 100644 --- a/test/Driver/environment.swift +++ b/test/Driver/environment.swift @@ -1,5 +1,5 @@ // UNSUPPORTED: objc_interop -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // Apple's "System Integrity Protection" makes this test fail on OS X. // RUN: %swift_driver_plain -sdk "" -target x86_64-unknown-gnu-linux -L/foo/ -driver-use-frontend-path %S/Inputs/print-var.sh %s LD_LIBRARY_PATH | %FileCheck -check-prefix=CHECK${LD_LIBRARY_PATH+_LAX} %s diff --git a/test/Driver/filelists.swift b/test/Driver/filelists.swift index 732f4914e580b..7b52089623f48 100644 --- a/test/Driver/filelists.swift +++ b/test/Driver/filelists.swift @@ -1,4 +1,4 @@ -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // RUN: %empty-directory(%t) // RUN: touch %t/a.swift %t/b.swift %t/c.swift diff --git a/test/Driver/frontend.swift b/test/Driver/frontend.swift index f0ee617810814..b34eb00876f34 100644 --- a/test/Driver/frontend.swift +++ b/test/Driver/frontend.swift @@ -1,5 +1,5 @@ // RUN: %swiftc_driver %s -### 2>&1 | %FileCheck %s -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // CHECK: swift-frontend diff --git a/test/Driver/fuzzer.swift b/test/Driver/fuzzer.swift index 308ba01f4374a..92536e81e58f9 100644 --- a/test/Driver/fuzzer.swift +++ b/test/Driver/fuzzer.swift @@ -1,4 +1,4 @@ -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // UNSUPPORTED: CPU=powerpc64le // RUN: %swiftc_driver -driver-print-jobs -sanitize=fuzzer,address -target x86_64-apple-macosx10.9 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=LIBFUZZER_OSX %s // RUN: %swiftc_driver -driver-print-jobs -sanitize=fuzzer,address -target x86_64-unknown-linux-gnu -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=LIBFUZZER_LINUX %s diff --git a/test/Driver/loaded_module_trace_nocrash.swift b/test/Driver/loaded_module_trace_nocrash.swift index 70960b5bbcdcb..b3b995071573e 100644 --- a/test/Driver/loaded_module_trace_nocrash.swift +++ b/test/Driver/loaded_module_trace_nocrash.swift @@ -1,4 +1,4 @@ -// UNSUPPORTED: -windows-msvc +// UNSUPPORTED: OS=windows-msvc // RUN: %empty-directory(%t) // RUN: mkdir -p %t/Mods/Foo.swiftmodule diff --git a/test/Driver/loaded_module_trace_swiftinterface.swift b/test/Driver/loaded_module_trace_swiftinterface.swift index 140215561e1b7..6289a02a0d120 100644 --- a/test/Driver/loaded_module_trace_swiftinterface.swift +++ b/test/Driver/loaded_module_trace_swiftinterface.swift @@ -1,4 +1,4 @@ -// UNSUPPORTED: -windows-msvc +// UNSUPPORTED: OS=windows-msvc // REQUIRES: SR13034 // 1) If there is no swiftmodule, use the swiftinterface diff --git a/test/Driver/macabi-environment.swift b/test/Driver/macabi-environment.swift index 928e31456a9d8..a55b43104be88 100644 --- a/test/Driver/macabi-environment.swift +++ b/test/Driver/macabi-environment.swift @@ -1,6 +1,6 @@ // Tests to check that the driver finds standard library in the macabi environment. -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -target x86_64-apple-ios13.1-macabi -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-MACABI %s // IOS13-MACABI: bin/swift diff --git a/test/Driver/parseable_output.swift b/test/Driver/parseable_output.swift index 46458c013c404..fda873a44d5ac 100644 --- a/test/Driver/parseable_output.swift +++ b/test/Driver/parseable_output.swift @@ -1,6 +1,6 @@ // RUN: %swiftc_driver_plain -emit-executable %s -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s -// XFAIL: freebsd, openbsd, linux +// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu // CHECK: {{[1-9][0-9]*}} // CHECK-NEXT: { diff --git a/test/Driver/parseable_output_unicode.swift b/test/Driver/parseable_output_unicode.swift index f8e8925cfe430..462fd6318a210 100644 --- a/test/Driver/parseable_output_unicode.swift +++ b/test/Driver/parseable_output_unicode.swift @@ -2,7 +2,7 @@ // RUN: cat "%S/Inputs/unicode.txt" >> %t.rsp // RUN: %swiftc_driver_plain -emit-executable @%t.rsp -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s -// XFAIL: freebsd, openbsd, linux +// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu // CHECK: {{[1-9][0-9]*}} // CHECK-NEXT: { diff --git a/test/Driver/pipe_round_robin.swift.gyb b/test/Driver/pipe_round_robin.swift.gyb index fcdc4211a9df5..343a34fd0038f 100644 --- a/test/Driver/pipe_round_robin.swift.gyb +++ b/test/Driver/pipe_round_robin.swift.gyb @@ -1,5 +1,5 @@ // Windows doesn't track/use read() and poll() -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // This test is unreliable on busy machines. // ALLOW_RETRIES: 5 // RUN: %empty-directory(%t/manyfuncs) diff --git a/test/Driver/sdk-apple.swift b/test/Driver/sdk-apple.swift index 228657231d4ea..481ebadcac64b 100644 --- a/test/Driver/sdk-apple.swift +++ b/test/Driver/sdk-apple.swift @@ -1,4 +1,4 @@ -// XFAIL: freebsd, openbsd, linux, windows +// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=windows-msvc // Test SDK detection for immediate mode. // RUN: %empty-directory(%t) diff --git a/test/IDE/print_clang_header_i386.swift b/test/IDE/print_clang_header_i386.swift index d78436f712305..4a5e6d78ea37a 100644 --- a/test/IDE/print_clang_header_i386.swift +++ b/test/IDE/print_clang_header_i386.swift @@ -1,7 +1,7 @@ // REQUIRES: OS=macosx // REQUIRES: CPU=x86_64 // FIXME: rdar://problem/19648117 Needs splitting objc parts out -// XFAIL: linux, freebsd +// XFAIL: OS=linux-gnu, OS=freebsd // RUN: echo '#include "header-to-print.h"' > %t.i386.m // RUN: %empty-directory(%t) diff --git a/test/IRGen/abitypes.swift b/test/IRGen/abitypes.swift index 1b6e28275fdaa..4be683f963b8f 100644 --- a/test/IRGen/abitypes.swift +++ b/test/IRGen/abitypes.swift @@ -1,7 +1,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir -enable-objc-interop | %FileCheck -check-prefix=%target-cpu-%target-os-abi %s // FIXME: rdar://problem/19648117 Needs splitting objc parts out -// XFAIL: linux, windows, openbsd +// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd import gadget import Foundation diff --git a/test/Interpreter/shebang-direct.swift b/test/Interpreter/shebang-direct.swift index cec0bb21344eb..ca6d376ad55e9 100644 --- a/test/Interpreter/shebang-direct.swift +++ b/test/Interpreter/shebang-direct.swift @@ -6,4 +6,4 @@ // RUN: %t.shebang.swift a b c | %FileCheck -check-prefix=THREE-ARGS %S/shebang-env.swift // REQUIRES: swift_interpreter -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu diff --git a/test/ModuleInterface/BadStdlib.swiftinterface b/test/ModuleInterface/BadStdlib.swiftinterface index f5375dabdfccb..54edbeda2e31d 100644 --- a/test/ModuleInterface/BadStdlib.swiftinterface +++ b/test/ModuleInterface/BadStdlib.swiftinterface @@ -16,4 +16,4 @@ import ClangMod public func useHasPointer(_: HasPointer) // FIXME: SR-14489 -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc diff --git a/test/ModuleInterface/swift_build_sdk_interfaces/compiler-crash.test-sh b/test/ModuleInterface/swift_build_sdk_interfaces/compiler-crash.test-sh index 73b53dcc6ab27..e17a48e34f491 100644 --- a/test/ModuleInterface/swift_build_sdk_interfaces/compiler-crash.test-sh +++ b/test/ModuleInterface/swift_build_sdk_interfaces/compiler-crash.test-sh @@ -1,5 +1,5 @@ # For its Windows counterpart, see compiler-crash-windows.test-sh -UNSUPPORTED: windows +UNSUPPORTED: OS=windows-msvc RUN: not %swift_build_sdk_interfaces -sdk %S/Inputs/mock-sdk/ -o %t/output -debug-crash-compiler 2>&1 | %FileCheck %s diff --git a/test/Prototypes/CollectionTransformers.swift b/test/Prototypes/CollectionTransformers.swift index 84dcafe4c04c6..e3a405c78486b 100644 --- a/test/Prototypes/CollectionTransformers.swift +++ b/test/Prototypes/CollectionTransformers.swift @@ -200,7 +200,7 @@ import Darwin import Dispatch // FIXME: port to Linux. -// XFAIL: linux, windows, openbsd +// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd // A wrapper for pthread_t with platform-independent interface. public struct _stdlib_pthread_t : Equatable, Hashable { diff --git a/test/Reflection/box_descriptors.sil b/test/Reflection/box_descriptors.sil index 1c0392b6972dc..641eab38e4178 100644 --- a/test/Reflection/box_descriptors.sil +++ b/test/Reflection/box_descriptors.sil @@ -3,10 +3,10 @@ // RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors%{target-shared-library-suffix} | %FileCheck %s // SR-10758 -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu // SR-12893 -// XFAIL: openbsd +// XFAIL: OS=openbsd sil_stage canonical diff --git a/test/Reflection/capture_descriptors.sil b/test/Reflection/capture_descriptors.sil index ef71fc31dc682..75d99f22138ea 100644 --- a/test/Reflection/capture_descriptors.sil +++ b/test/Reflection/capture_descriptors.sil @@ -2,7 +2,7 @@ // REQUIRES: no_asan // SR-12893 -// XFAIL: openbsd +// XFAIL: OS=openbsd // UNSUPPORTED: OS=linux-android, OS=linux-androideabi // RUN: %empty-directory(%t) diff --git a/test/Reflection/conformance_descriptors.swift b/test/Reflection/conformance_descriptors.swift index 91caa8cc2351a..f6d6fc65aad34 100644 --- a/test/Reflection/conformance_descriptors.swift +++ b/test/Reflection/conformance_descriptors.swift @@ -1,4 +1,4 @@ -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // Temporarily disable on AArch64 Linux (rdar://88451721) // UNSUPPORTED: OS=linux-gnu && CPU=aarch64 diff --git a/test/Reflection/typeref_decoding_imported.swift b/test/Reflection/typeref_decoding_imported.swift index 4d2c7bcc8a75b..de550812f7ba3 100644 --- a/test/Reflection/typeref_decoding_imported.swift +++ b/test/Reflection/typeref_decoding_imported.swift @@ -1,7 +1,7 @@ // XFAIL: OS=windows-msvc // SR-12893 -// XFAIL: openbsd +// XFAIL: OS=openbsd // RUN: %empty-directory(%t) diff --git a/test/SILOptimizer/addr_escape_info.sil b/test/SILOptimizer/addr_escape_info.sil index 2bc43557ec89e..0f6c069cec95a 100644 --- a/test/SILOptimizer/addr_escape_info.sil +++ b/test/SILOptimizer/addr_escape_info.sil @@ -3,7 +3,7 @@ // REQUIRES: swift_in_compiler // rdar92963081 -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu sil_stage canonical diff --git a/test/SILOptimizer/escape_info.sil b/test/SILOptimizer/escape_info.sil index f51e6022f0d46..8503be891ce3f 100644 --- a/test/SILOptimizer/escape_info.sil +++ b/test/SILOptimizer/escape_info.sil @@ -3,7 +3,7 @@ // REQUIRES: swift_in_compiler // rdar92963081 -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu sil_stage canonical diff --git a/test/SILOptimizer/no-external-defs-onone.sil b/test/SILOptimizer/no-external-defs-onone.sil index 046df6f55074f..a7230a8105811 100644 --- a/test/SILOptimizer/no-external-defs-onone.sil +++ b/test/SILOptimizer/no-external-defs-onone.sil @@ -7,7 +7,7 @@ // CHECK-NOT: public_external_unused_test // TODO: update check line for the hidden_external_test for Windows. -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc sil public_external [serialized] @public_external_test : $@convention(thin) () -> () { %0 = tuple() diff --git a/test/SILOptimizer/ranges.sil b/test/SILOptimizer/ranges.sil index f28e4a5d2c896..ee34a648f64e3 100644 --- a/test/SILOptimizer/ranges.sil +++ b/test/SILOptimizer/ranges.sil @@ -3,7 +3,7 @@ // REQUIRES: swift_in_compiler // rdar92963081 -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu sil_stage canonical diff --git a/test/Sanitizers/asan/recover.swift b/test/Sanitizers/asan/recover.swift index ee879e0f7dee5..d858c333f4298 100644 --- a/test/Sanitizers/asan/recover.swift +++ b/test/Sanitizers/asan/recover.swift @@ -1,6 +1,6 @@ // REQUIRES: executable_test // REQUIRES: asan_runtime -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // Check with recovery instrumentation and the runtime option to continue execution. // RUN: %target-swiftc_driver %s -target %sanitizers-target-triple -g -sanitize=address -sanitize-recover=address -import-objc-header %S/asan_interface.h -emit-ir -o %t.asan_recover.ll diff --git a/test/Sanitizers/tsan/actor_counters.swift b/test/Sanitizers/tsan/actor_counters.swift index 9cf11f4a98964..4fd7d86140daa 100644 --- a/test/Sanitizers/tsan/actor_counters.swift +++ b/test/Sanitizers/tsan/actor_counters.swift @@ -5,8 +5,8 @@ // REQUIRES: libdispatch // REQUIRES: tsan_runtime // UNSUPPORTED: use_os_stdlib -// UNSUPPORTED: linux -// UNSUPPORTED: windows +// UNSUPPORTED: OS=linux-gnu +// UNSUPPORTED: OS=windows-msvc // REQUIRES: rdar83246843 diff --git a/test/Sanitizers/tsan/objc_async.swift b/test/Sanitizers/tsan/objc_async.swift index 50ee8ce60b5b4..1e5e58696c3ec 100644 --- a/test/Sanitizers/tsan/objc_async.swift +++ b/test/Sanitizers/tsan/objc_async.swift @@ -7,8 +7,8 @@ // REQUIRES: concurrency // REQUIRES: objc_interop // REQUIRES: tsan_runtime -// UNSUPPORTED: linux -// UNSUPPORTED: windows +// UNSUPPORTED: OS=linux-gnu +// UNSUPPORTED: OS=windows-msvc // rdar://76038845 // UNSUPPORTED: use_os_stdlib diff --git a/test/decl/result_builder_fixits.swift b/test/decl/result_builder_fixits.swift index 9c49ff29d6d3d..2a1584e4c3d57 100644 --- a/test/decl/result_builder_fixits.swift +++ b/test/decl/result_builder_fixits.swift @@ -1,5 +1,5 @@ // RUN: %target-typecheck-verify-swift -disable-availability-checking -// UNSUPPORTED: windows +// UNSUPPORTED: OS=windows-msvc // Line-feeds in Fix-Its fail to check on Windows. @resultBuilder diff --git a/test/multifile/protocol-conformance-redundant.swift b/test/multifile/protocol-conformance-redundant.swift index 05f87440cde59..f27a8a346b5d6 100644 --- a/test/multifile/protocol-conformance-redundant.swift +++ b/test/multifile/protocol-conformance-redundant.swift @@ -6,7 +6,7 @@ // RUN: %target-run %t/main %t/%target-library-name(Def) %t/%target-library-name(Ext) 2>&1 | %FileCheck %s // REQUIRES: executable_test -// XFAIL: windows +// XFAIL: OS=windows-msvc // CHECK: Warning: 'main.Sub' conforms to protocol 'Hello', but it also inherits conformance from 'Def.Super'. Relying on a particular conformance is undefined behaviour. // CHECK: Hello diff --git a/test/stdlib/simd_diagnostics.swift b/test/stdlib/simd_diagnostics.swift index 44fa7da18625e..03f7ce260f214 100644 --- a/test/stdlib/simd_diagnostics.swift +++ b/test/stdlib/simd_diagnostics.swift @@ -1,7 +1,7 @@ // RUN: %target-typecheck-verify-swift // FIXME: No simd module on linux rdar://problem/20795411 -// XFAIL: linux, windows, openbsd +// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd // XFAIL: OS=wasi import simd diff --git a/validation-test/SILOptimizer/large_string_array.swift.gyb b/validation-test/SILOptimizer/large_string_array.swift.gyb index 360790a651285..b86e6201391bb 100644 --- a/validation-test/SILOptimizer/large_string_array.swift.gyb +++ b/validation-test/SILOptimizer/large_string_array.swift.gyb @@ -2,7 +2,7 @@ // RUN: %gyb %s > %t/main.swift // https://bugs.swift.org/browse/SR-14460 -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu // The compiler should finish in less than 1 minute. To give some slack, // specify a timeout of 5 minutes. diff --git a/validation-test/Sema/type_checker_perf/fast/rdar23620262.swift b/validation-test/Sema/type_checker_perf/fast/rdar23620262.swift index 3f503115680aa..fdd04f1b2b283 100644 --- a/validation-test/Sema/type_checker_perf/fast/rdar23620262.swift +++ b/validation-test/Sema/type_checker_perf/fast/rdar23620262.swift @@ -1,7 +1,7 @@ // RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 // REQUIRES: tools-release,no_asan -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu // expected-no-diagnostics diff --git a/validation-test/Sema/type_checker_perf/fast/rdar54580427.swift b/validation-test/Sema/type_checker_perf/fast/rdar54580427.swift index faac1e377ff9b..a53909ab0ec96 100644 --- a/validation-test/Sema/type_checker_perf/fast/rdar54580427.swift +++ b/validation-test/Sema/type_checker_perf/fast/rdar54580427.swift @@ -1,7 +1,7 @@ // RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-expression-time-threshold=1 // REQUIRES: asserts,no_asan -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu enum Val { case d([String: Val]) diff --git a/validation-test/execution/dsohandle-multi-module.swift b/validation-test/execution/dsohandle-multi-module.swift index 3a7f98c2b2c5a..bda5819b0102f 100644 --- a/validation-test/execution/dsohandle-multi-module.swift +++ b/validation-test/execution/dsohandle-multi-module.swift @@ -8,7 +8,7 @@ // REQUIRES: executable_test -// UNSUPPORTED: linux +// UNSUPPORTED: OS=linux-gnu import first import second diff --git a/validation-test/stdlib/SIMDParameterPassing.swift.gyb b/validation-test/stdlib/SIMDParameterPassing.swift.gyb index 5cf58db6c77e6..d2ed07df5ca00 100644 --- a/validation-test/stdlib/SIMDParameterPassing.swift.gyb +++ b/validation-test/stdlib/SIMDParameterPassing.swift.gyb @@ -18,7 +18,7 @@ // REQUIRES: executable_test // REQUIRES: long_test -// XFAIL: linux +// XFAIL: OS=linux-gnu import StdlibUnittest import simd