Merge pull request #38485 from artemcm/Fix55ClangTargetTest

[5.5] Update the ScanDependencies test to use %target-cpu

Author: artemcm

test/ScanDependencies/Inputs/Swift/XWithTarget.swiftmodule/arm64-apple-macos.swiftinterface

@@ -0,0 +1,5 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name XWithTarget  -target arm64-apple-macosx10.9
+import Swift
+@_exported import X
+public func overlayFuncX() { }

test/ScanDependencies/Inputs/Swift/XWithTarget.swiftinterface renamed to test/ScanDependencies/Inputs/Swift/XWithTarget.swiftmodule/x86_64-apple-macos.swiftinterface

@@ -1,21 +1,22 @@
 // REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
+
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %target-swift-frontend -emit-module -o %t.foo.swiftmodule -module-cache-path %t.module-cache -I %S/Inputs/CHeaders -I %S/Inputs/Swift %s -target x86_64-apple-macosx10.14
+// RUN: %target-swift-frontend -emit-module -o %t.foo.swiftmodule -module-cache-path %t.module-cache -I %S/Inputs/CHeaders -I %S/Inputs/Swift %s -target %target-cpu-apple-macosx10.14
 
 // Without -clang-target, we build two X.pcm
 // RUN: find %t.module-cache -name "X-*.pcm" | count 2
 
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %target-swift-frontend -emit-module -o %t.foo.swiftmodule -module-cache-path %t.module-cache -I %S/Inputs/CHeaders -I %S/Inputs/Swift %s -target x86_64-apple-macosx10.14 -clang-target x86_64-apple-macosx10.14
+// RUN: %target-swift-frontend -emit-module -o %t.foo.swiftmodule -module-cache-path %t.module-cache -I %S/Inputs/CHeaders -I %S/Inputs/Swift %s -target %target-cpu-apple-macosx10.14 -clang-target %target-cpu-apple-macosx10.14
 
 // With -clang-target, we build one X.pcm
 // RUN: find %t.module-cache -name "X-*.pcm" | count 1
+// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t.module-cache %s -o %t.deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -target %target-cpu-apple-macosx10.14 -clang-target %target-cpu-apple-macosx10.14
 
-// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t.module-cache %s -o %t.deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -target x86_64-apple-macosx10.14 -clang-target x86_64-apple-macosx10.14
 // RUN: %FileCheck %s < %t.deps.json
 
 // CHECK: "-clang-target"
-// CHECK-NEXT: "x86_64-apple-macosx10.14"
-
+// CHECK-NEXT: "{{.*}}-apple-macosx10.14"
 import X
 import XWithTarget