[Tests] Make OS features consistent

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
 

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

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
 

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 {

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
 

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

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

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
 

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

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

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

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

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

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

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

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

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

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
 

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
 

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

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

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
 

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/*

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/*

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

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

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

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
 

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
 

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

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

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

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

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: {

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: {

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)

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)

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)

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

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

test/ModuleInterface/BadStdlib.swiftinterface

@@ -16,4 +16,4 @@ import ClangMod
 public func useHasPointer(_: HasPointer)
 
 // FIXME: SR-14489
-// UNSUPPORTED: windows
+// UNSUPPORTED: OS=windows-msvc

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
 

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 {

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
 

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)

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

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)
 

test/SILOptimizer/addr_escape_info.sil

@@ -3,7 +3,7 @@
 // REQUIRES: swift_in_compiler
 
 // rdar92963081
-// UNSUPPORTED: linux
+// UNSUPPORTED: OS=linux-gnu
 
 sil_stage canonical
 

test/SILOptimizer/escape_info.sil

@@ -3,7 +3,7 @@
 // REQUIRES: swift_in_compiler
 
 // rdar92963081
-// UNSUPPORTED: linux
+// UNSUPPORTED: OS=linux-gnu
 
 
 sil_stage canonical