@@ -285,6 +285,7 @@ config.llvm_link = inferSwiftBinary('llvm-link')
285
285
config .swift_llvm_opt = inferSwiftBinary ('swift-llvm-opt' )
286
286
config .llvm_profdata = inferSwiftBinary ('llvm-profdata' )
287
287
config .llvm_cov = inferSwiftBinary ('llvm-cov' )
288
+ config .filecheck = inferSwiftBinary ('FileCheck' )
288
289
289
290
config .swift_utils = os .path .join (config .swift_src_root , 'utils' )
290
291
config .line_directive = os .path .join (config .swift_utils , 'line-directive' )
@@ -1007,11 +1008,12 @@ config.substitutions.append(('%llvm-cov', config.llvm_cov))
1007
1008
1008
1009
config .substitutions .append (
1009
1010
('%FileCheck' ,
1010
- '%s --sanitize \' BUILD_DIR=%s\' --sanitize \' SOURCE_DIR=%s\' ' %
1011
+ '%s --sanitize \' BUILD_DIR=%s\' --sanitize \' SOURCE_DIR=%s\' --use-filecheck \' %s \' ' %
1011
1012
(config .PathSanitizingFileCheck ,
1012
1013
pipes .quote (swift_obj_root ),
1013
- pipes .quote (config .swift_src_root ))))
1014
- config .substitutions .append (('%raw-FileCheck' , 'FileCheck' ))
1014
+ pipes .quote (config .swift_src_root ),
1015
+ pipes .quote (config .filecheck ))))
1016
+ config .substitutions .append (('%raw-FileCheck' , pipes .quote (config .filecheck )))
1015
1017
1016
1018
# If static stdlib is present, enable static stdlib tests
1017
1019
static_stdlib_path = os .path .join (os .path .join (config .swift_lib_dir ,"swift_static" ), config .target_sdk_name )
0 commit comments