Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit fabf61faec65 · 2019-03-26T08:49:37.000-07:00
diff --git a/test/ClangImporter/MixedSource/autolinking.swift b/test/ClangImporter/MixedSource/autolinking.swift
@@ -2,10 +2,7 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: OS=linux-gnu
-// UNSUPPORTED: OS=linux-gnueabihf
-// UNSUPPORTED: OS=freebsd
-// UNSUPPORTED: OS=linux-androideabi
+// UNSUPPORTED: autolink-extract
 
 // Use a type declared in the Clang part of the module.
 public let y = Test()
diff --git a/test/ClangImporter/autolinking.swift b/test/ClangImporter/autolinking.swift
@@ -14,10 +14,7 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: OS=linux-gnu
-// UNSUPPORTED: OS=linux-gnueabihf
-// UNSUPPORTED: OS=freebsd
-// UNSUPPORTED: OS=linux-androideabi
+// UNSUPPORTED: autolink-extract
 
 import LinkMusket
 import LinkFramework
diff --git a/test/Serialization/autolinking-inlinable-inferred.swift b/test/Serialization/autolinking-inlinable-inferred.swift
@@ -11,10 +11,7 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: OS=linux-gnu
-// UNSUPPORTED: OS=linux-gnueabihf
-// UNSUPPORTED: OS=freebsd
-// UNSUPPORTED: OS=linux-androideabi
+/// UNSUPPORTED: autolink-extract
 
 import autolinking_module_inferred
 
diff --git a/test/Serialization/autolinking.swift b/test/Serialization/autolinking.swift
@@ -21,10 +21,7 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: OS=linux-gnu
-// UNSUPPORTED: OS=linux-gnueabihf
-// UNSUPPORTED: OS=freebsd
-// UNSUPPORTED: OS=linux-androideabi
+// UNSUPPORTED: autolink-extract
 
 import someModule
 
