Skip to content

Commit 03c28ea

Browse files
committed
Fix tests who aren't using %target-cpu
don't import string processing
1 parent 4606c9f commit 03c28ea

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

test/Concurrency/Backdeploy/weak_linking.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend %s -target x86_64-apple-macosx12.0 -module-name main -emit-ir -o %t/new.ir
2+
// RUN: %target-swift-frontend %s -target %target-cpu-apple-macosx12.0 -module-name main -emit-ir -o %t/new.ir
33
// RUN: %FileCheck %s --check-prefix=NEW < %t/new.ir
4-
// RUN: %target-swift-frontend %s -target x86_64-apple-macosx10.15 -module-name main -emit-ir -o %t/old.ir -disable-availability-checking
4+
// RUN: %target-swift-frontend %s -target %target-cpu-apple-macosx10.15 -module-name main -emit-ir -o %t/old.ir -disable-availability-checking
55
// RUN: %FileCheck %s --check-prefix=OLD < %t/old.ir
6-
// RUN: %target-swift-frontend %s -target x86_64-apple-macosx10.15 -O -module-name main -emit-ir -o %t/optimized.ir -disable-availability-checking
6+
// RUN: %target-swift-frontend %s -target %target-cpu-apple-macosx10.15 -O -module-name main -emit-ir -o %t/optimized.ir -disable-availability-checking
77
// RUN: %FileCheck %s --check-prefix=OPTIMIZED < %t/optimized.ir
88

99

test/IRGen/swift_async_extended_frame_info.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// RUN: %target-swift-frontend -disable-availability-checking -swift-async-frame-pointer=always -target x86_64-apple-macosx12 %s -S | %FileCheck -check-prefix=ALWAYS %s
99

1010
// REQUIRES: OS=macosx
11+
// REQUIRES: CPU=x86_64
1112

1213
public func someAsyncFunction() async {
1314
}

test/ScanDependencies/batch_module_scan_versioned.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
// RUN: echo "[{" > %/t/inputs/input.json
77
// RUN: echo "\"clangModuleName\": \"G\"," >> %/t/inputs/input.json
8-
// RUN: echo "\"arguments\": \"-Xcc -target -Xcc x86_64-apple-macosx11.0\"," >> %/t/inputs/input.json
8+
// RUN: echo "\"arguments\": \"-Xcc -target -Xcc %target-cpu-apple-macosx11.0\"," >> %/t/inputs/input.json
99
// RUN: echo "\"output\": \"%/t/outputs/G_110.pcm.json\"" >> %/t/inputs/input.json
1010
// RUN: echo "}," >> %/t/inputs/input.json
1111
// RUN: echo "{" >> %/t/inputs/input.json
1212
// RUN: echo "\"clangModuleName\": \"G\"," >> %/t/inputs/input.json
13-
// RUN: echo "\"arguments\": \"-Xcc -target -Xcc x86_64-apple-macosx10.9\"," >> %/t/inputs/input.json
13+
// RUN: echo "\"arguments\": \"-Xcc -target -Xcc %target-cpu-apple-macosx10.9\"," >> %/t/inputs/input.json
1414
// RUN: echo "\"output\": \"%/t/outputs/G_109.pcm.json\"" >> %/t/inputs/input.json
1515
// RUN: echo "}]" >> %/t/inputs/input.json
1616

17-
// RUN: %target-swift-frontend -scan-dependencies -disable-implicit-concurrency-module-import -target x86_64-apple-macosx11.0 -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4 -batch-scan-input-file %/t/inputs/input.json
17+
// RUN: %target-swift-frontend -scan-dependencies -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -target %target-cpu-apple-macosx11.0 -module-cache-path %t/clang-module-cache %s -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -emit-dependencies -emit-dependencies-path %t/deps.d -import-objc-header %S/Inputs/CHeaders/Bridging.h -swift-version 4 -batch-scan-input-file %/t/inputs/input.json
1818

1919
// Check the contents of the JSON output
2020
// RUN: %FileCheck %s -check-prefix=CHECK-PCM109 < %t/outputs/G_109.pcm.json

validation-test/Sema/rdar84879566.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -typecheck -target x86_64-apple-macosx10.15 -swift-version 5 %S/Inputs/rdar84879566_invalid_decls.swift -primary-file %s -verify
1+
// RUN: %target-swift-frontend -typecheck -target %target-cpu-apple-macosx10.15 -swift-version 5 %S/Inputs/rdar84879566_invalid_decls.swift -primary-file %s -verify
22
// REQUIRES: OS=macosx
33

44
protocol Tupled {

0 commit comments

Comments
 (0)