Skip to content

Commit 4700241

Browse files
authored
Merge pull request #19767 from compnerd/strings
test: use llvm-strings instead of strings
2 parents dd7f757 + cdf986f commit 4700241

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ function(get_test_dependencies SDK result_var_name)
4747
if(NOT SWIFT_BUILT_STANDALONE)
4848
list(APPEND deps_binaries FileCheck arcmt-test c-arcmt-test c-index-test
4949
clang llc llvm-cov llvm-dwarfdump llvm-link llvm-as llvm-dis
50-
llvm-bcanalyzer llvm-nm llvm-readobj llvm-profdata count not)
50+
llvm-bcanalyzer llvm-nm llvm-readobj llvm-profdata count not
51+
llvm-strings)
5152
endif()
5253
if(SWIFT_BUILD_SOURCEKIT)
5354
list(APPEND deps_binaries sourcekitd-test complete-test)

test/Serialization/comments-params.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// RUN: %empty-directory(%t)
55
// RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/comments.swiftmodule -emit-module-doc -emit-module-doc-path %t/comments.swiftdoc -group-info-path %S/Inputs/comments-params.json %s
6-
// RUN: strings %t/comments.swiftdoc > %t.txt
6+
// RUN: %llvm-strings %t/comments.swiftdoc > %t.txt
77
// RUN: %FileCheck %s < %t.txt
88
// RUN: %FileCheck -check-prefix NEGATIVE %s < %t.txt
99

test/lit.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ config.llvm_link = inferSwiftBinary('llvm-link')
267267
config.swift_llvm_opt = inferSwiftBinary('swift-llvm-opt')
268268
config.llvm_profdata = inferSwiftBinary('llvm-profdata')
269269
config.llvm_cov = inferSwiftBinary('llvm-cov')
270+
config.llvm_strings = inferSwiftBinary('llvm-strings')
270271
config.filecheck = inferSwiftBinary('FileCheck')
271272
config.llvm_dwarfdump = inferSwiftBinary('llvm-dwarfdump')
272273
config.llvm_dis = inferSwiftBinary('llvm-dis')
@@ -374,6 +375,7 @@ config.substitutions.append( ('%llvm-dis', config.llvm_dis) )
374375
config.substitutions.append( ('%swift-demangle-yamldump', config.swift_demangle_yamldump) )
375376
config.substitutions.append( ('%Benchmark_O', config.benchmark_o) )
376377
config.substitutions.append( ('%Benchmark_Driver', config.benchmark_driver) )
378+
config.substitutions.append( ('%llvm-strings', config.llvm_strings) )
377379

378380
# This must come after all substitutions containing "%swift".
379381
config.substitutions.append(

0 commit comments

Comments
 (0)