[Testing] Eliminate REQUIRES-ANY usage

rintaro · rintaro · commit 0aa3125b624f · 2020-01-14T10:21:49.000-08:00
REQUIRES-ANY is deprecated and being removed. Use boolean expressions.

rdar://problem/58549266
diff --git a/test/Driver/autolink-force-load-no-comdat.swift b/test/Driver/autolink-force-load-no-comdat.swift
@@ -2,7 +2,7 @@
 // RUN: not %swiftc_driver -autolink-force-load -incremental %s 2>&1 | %FileCheck -check-prefix=AUTOLINK_FORCE_LOAD %s
 
 // MACHO targets do not support COMDAT
-// REQUIRES-ANY: OS=macosx, OS=tvos, OS=watchos, OS=ios
+// REQUIRES: OS=macosx || OS=tvos || OS=watchos || OS=ios
 
 // AUTOLINK_FORCE_LOAD: error: '-autolink-force-load' is not supported with '-incremental'
 
diff --git a/test/SourceKit/CursorInfo/cursor_rename.swift b/test/SourceKit/CursorInfo/cursor_rename.swift
@@ -18,4 +18,4 @@ _ = Foo.init(2)
 // CHECK1: Rename
 // CHECK2-NOT: Rename
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/DocSupport/doc_clang_module.swift b/test/SourceKit/DocSupport/doc_clang_module.swift
@@ -1,7 +1,7 @@
 // REQUIRES: objc_interop
 
 // FIXME: the test output we're comparing to is specific to macOS.
-// REQUIRES-ANY: OS=macosx
+// REQUIRES: OS=macosx
 
 // RUN: %empty-directory(%t)
 // RUN: %build-clang-importer-objc-overlays
diff --git a/test/SourceKit/InterfaceGen/gen_clang_module.swift b/test/SourceKit/InterfaceGen/gen_clang_module.swift
@@ -5,7 +5,7 @@ var x: FooClassBase
 // REQUIRES: objc_interop
 
 // FIXME: the test output we're comparing to is specific to macOS.
-// REQUIRES-ANY: OS=macosx
+// REQUIRES: OS=macosx
 
 // RUN: %empty-directory(%t.overlays)
 // RUN: %empty-directory(%t)
diff --git a/test/SourceKit/InterfaceGen/gen_mixed_module.swift b/test/SourceKit/InterfaceGen/gen_mixed_module.swift
@@ -3,7 +3,7 @@ var x = 10
 // REQUIRES: objc_interop
 
 // FIXME: the test output we're comparing to is specific to macOS.
-// REQUIRES-ANY: OS=macosx
+// REQUIRES: OS=macosx
 
 // RUN: %empty-directory(%t.overlays)
 // RUN: %empty-directory(%t)
diff --git a/test/SourceKit/Refactoring/basic.swift b/test/SourceKit/Refactoring/basic.swift
@@ -152,4 +152,4 @@ func foo7() -> String {
 
 // CHECK-LOCALIZE-STRING: source.refactoring.kind.localize.string
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/Refactoring/rename-objc.swift b/test/SourceKit/Refactoring/rename-objc.swift
@@ -18,4 +18,4 @@ func foo1() {
 // CHECK2: ACTIONS BEGIN
 // CHECK2-NEXT: ACTIONS END
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/expand-default.swift b/test/SourceKit/Refactoring/semantic-refactoring/expand-default.swift
@@ -13,4 +13,4 @@ func foo(e : E) {
 // RUN: %sourcekitd-test -req=expand-default -pos=7:7 %s -- %s > %t.result/expand-default.swift.expected
 // RUN: diff -u %S/expand-default.swift.expected %t.result/expand-default.swift.expected
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/extract-func-default.swift b/test/SourceKit/Refactoring/semantic-refactoring/extract-func-default.swift
@@ -9,4 +9,4 @@ func foo() -> Int {
 // RUN: diff -u %S/extract-func-default.swift.expected %t.result/extract-func-default.swift.expected
 
 // FIXME: Fails on linux with assertion: "!GlibcModuleMapPath.empty()"" failed
-// REQUIRES-ANY: OS=macosx
+// REQUIRES: OS=macosx
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/extract-func-with-args.swift b/test/SourceKit/Refactoring/semantic-refactoring/extract-func-with-args.swift
@@ -9,4 +9,4 @@ func foo() -> Int {
 // RUN: diff -u %S/extract-func-with-args.swift.expected %t.result/extract-func-with-args.swift.expected
 
 // FIXME: Fails on linux with assertion: "!GlibcModuleMapPath.empty()"" failed
-// REQUIRES-ANY: OS=macosx
+// REQUIRES: OS=macosx
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/extract-func.swift b/test/SourceKit/Refactoring/semantic-refactoring/extract-func.swift
@@ -9,4 +9,4 @@ func foo() -> Int {
 // RUN: diff -u %S/extract-func.swift.expected %t.result/extract-func.swift.expected
 
 // FIXME: Fails on linux with assertion: "!GlibcModuleMapPath.empty()"" failed
-// REQUIRES-ANY: OS=macosx
+// REQUIRES: OS=macosx
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/extract-repeated-expression.swift b/test/SourceKit/Refactoring/semantic-refactoring/extract-repeated-expression.swift
@@ -8,4 +8,4 @@ func foo() -> Int {
 // RUN: %sourcekitd-test -req=extract-repeated -pos=3:11 -end-pos 3:12 -name new_name %s -- %s > %t.result/extract-repeated-expression.swift.expected
 // RUN: diff -u %S/extract-repeated-expression.swift.expected %t.result/extract-repeated-expression.swift.expected
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/fill-stub.swift b/test/SourceKit/Refactoring/semantic-refactoring/fill-stub.swift
@@ -8,4 +8,4 @@ class C1 : P {}
 // RUN: %sourcekitd-test -req=fill-stub -pos=5:8 %s -- %s > %t.result/fill-stub.swift.expected
 // RUN: diff -u %S/fill-stub.swift.expected %t.result/fill-stub.swift.expected
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/local-rename.swift b/test/SourceKit/Refactoring/semantic-refactoring/local-rename.swift
@@ -19,4 +19,4 @@ func foo() {
 // RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=7:11 %s -- %s > %t.result/local-rename-lazy.swift.expected
 // RUN: diff -u %S/local-rename-lazy.swift.expected %t.result/local-rename-lazy.swift.expected
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/test/SourceKit/Refactoring/semantic-refactoring/localize-string.swift b/test/SourceKit/Refactoring/semantic-refactoring/localize-string.swift
@@ -6,4 +6,4 @@ func foo() -> String {
 // RUN: %sourcekitd-test -req=localize-string -pos=2:10 %s -- %s > %t.result/localize-string.swift.expected
 // RUN: diff -u %S/localize-string.swift.expected %t.result/localize-string.swift.expected
 
-// REQUIRES-ANY: OS=macosx, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=linux-gnu
diff --git a/validation-test/stdlib/Glibc.swift b/validation-test/stdlib/Glibc.swift
@@ -6,7 +6,7 @@
 // UNSUPPORTED: OS=tvos
 // UNSUPPORTED: OS=watchos
 
-// REQUIRES-ANY: OS=linux-gnu, OS=linux-androideabi, OS=linux-android
+// REQUIRES: OS=linux-gnu || OS=linux-androideabi || OS=linux-android
 
 import Swift
 import StdlibUnittest
diff --git a/validation-test/stdlib/POSIXErrorCode.swift b/validation-test/stdlib/POSIXErrorCode.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 //
-// REQUIRES-ANY: OS=macosx, OS=ios, OS=tvos, OS=watchos, OS=linux-androideabi, OS=linux-android, OS=linux-gnu
+// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-androideabi || OS=linux-android || OS=linux-gnu
 
 import Swift
 import StdlibUnittest
diff --git a/validation-test/stdlib/StringLowercasedUppercased.swift b/validation-test/stdlib/StringLowercasedUppercased.swift
@@ -5,7 +5,7 @@
 // directly.  It is not specific to Linux, it is just that on
 // Apple platforms we are using the NSString bridge right now.
 
-// REQUIRES-ANY: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
+// REQUIRES: OS=linux-gnu || OS=linux-android || OS=linux-androideabi
 
 import StdlibUnittest
 

Original file line number	Diff line number	Diff line change
`@@ -152,4 +152,4 @@ func foo7() -> String {`
`152`	`152`
`153`	`153`	`// CHECK-LOCALIZE-STRING: source.refactoring.kind.localize.string`
`154`	`154`
`155`		`-// REQUIRES-ANY: OS=macosx, OS=linux-gnu`
	`155`	`+// REQUIRES: OS=macosx \|\| OS=linux-gnu`