Merge pull request #19641 from jrose-apple/overlay-more-like-overzealous

Author: swift-ci

validation-test/ModuleInterface/verify_all_overlays.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: for x in %platform-sdk-overlay-dir/*.swiftinterface; do [[ $(basename "$x") = Swift.swiftinterface || $(basename "$x") = simd.swiftinterface ]] && continue; %target-swift-frontend "$x" -emit-module -o %t/$(basename "${x/.*}").swiftmodule -disable-objc-attr-requires-foundation-module -enable-resilience -Fsystem %sdk/System/Library/PrivateFrameworks/ -swift-version 4 || echo '%target-os:' $(basename "$x") >> %t/failures.txt; done
+// RUN: for x in %platform-sdk-overlay-dir/*.swiftinterface; do [[ $(basename "$x") = Swift.swiftinterface || $(basename "$x") = simd.swiftinterface || $(basename "$x") = SwiftLang.swiftinterface ]] && continue; %target-swift-frontend "$x" -emit-module -o %t/$(basename "${x/.*}").swiftmodule -disable-objc-attr-requires-foundation-module -enable-resilience -Fsystem %sdk/System/Library/PrivateFrameworks/ -swift-version 4 || echo '%target-os:' $(basename "$x") >> %t/failures.txt; done
 // RUN: diff <(grep '%target-os:' %s) <(sort -f %t/failures.txt)
 
 // REQUIRES: nonexecutable_test
@@ -13,9 +13,6 @@ ios: CloudKit.swiftinterface
 tvos: CloudKit.swiftinterface
 watchos: CloudKit.swiftinterface
 
-// Missing search path for sourcekitd.framework.
-macosx: SwiftLang.swiftinterface
-
 // Needs to be built as Swift 4.2.
 ios: UIKit.swiftinterface
 tvos: UIKit.swiftinterface

validation-test/ModuleInterface/verify_all_overlays_O.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: for x in %platform-sdk-overlay-dir/*.swiftinterface; do [[ $(basename "$x") = Swift.swiftinterface || $(basename "$x") = simd.swiftinterface ]] && continue; %target-swift-frontend "$x" -emit-module -o %t/$(basename "${x/.*}").swiftmodule -disable-objc-attr-requires-foundation-module -enable-resilience -Fsystem %sdk/System/Library/PrivateFrameworks/ -swift-version 4 -O || echo '%target-os:' $(basename "$x") >> %t/failures.txt; done
+// RUN: for x in %platform-sdk-overlay-dir/*.swiftinterface; do [[ $(basename "$x") = Swift.swiftinterface || $(basename "$x") = simd.swiftinterface || $(basename "$x") = SwiftLang.swiftinterface ]] && continue; %target-swift-frontend "$x" -emit-module -o %t/$(basename "${x/.*}").swiftmodule -disable-objc-attr-requires-foundation-module -enable-resilience -Fsystem %sdk/System/Library/PrivateFrameworks/ -swift-version 4 -O || echo '%target-os:' $(basename "$x") >> %t/failures.txt; done
 // RUN: diff <(grep '%target-os:' %s) <(sort -f %t/failures.txt)
 
 // REQUIRES: nonexecutable_test
@@ -13,9 +13,6 @@ ios: CloudKit.swiftinterface
 tvos: CloudKit.swiftinterface
 watchos: CloudKit.swiftinterface
 
-// Missing search path for sourcekitd.framework.
-macosx: SwiftLang.swiftinterface
-
 // Needs to be built as Swift 4.2.
 ios: UIKit.swiftinterface
 tvos: UIKit.swiftinterface