[libc++] Use braces around %file_dependencies substitution

This one was left out from a previous commit.
This commit is contained in:
Louis Dionne 2020-03-27 11:33:00 -04:00
parent d7084fa34a
commit e9a2caf34c
3 changed files with 3 additions and 3 deletions

View File

@ -9,4 +9,4 @@
// FILE_DEPENDENCIES: test.pass.cpp
// RUN: echo %file_dependencies | grep 'test.pass.cpp'
// RUN: echo %{file_dependencies} | grep 'test.pass.cpp'

View File

@ -1065,7 +1065,7 @@ class Configuration(object):
run_py = os.path.join(self.libcxx_src_root, 'utils', 'run.py')
env_vars = ' '.join('%s=%s' % (k, pipes.quote(v)) for (k, v) in self.exec_env.items())
exec_str = '%s %s --codesign_identity "%s" --working_directory "%%S" ' \
'--dependencies %%file_dependencies --env %s -- ' % \
'--dependencies %%{file_dependencies} --env %s -- ' % \
(pipes.quote(sys.executable), pipes.quote(run_py),
codesign_ident, env_vars)
sub.append(('%{exec}', exec_str))

View File

@ -123,7 +123,7 @@ class LibcxxTestFormat(object):
tmpDir, tmpBase = lit.TestRunner.getTempPaths(test)
substitutions = lit.TestRunner.getDefaultSubstitutions(test, tmpDir,
tmpBase)
substitutions.append(('%file_dependencies', ' '.join(data_files)))
substitutions.append(('%{file_dependencies}', ' '.join(data_files)))
script = lit.TestRunner.applySubstitutions(script, substitutions,
recursion_limit=lit_config.recursiveExpansionLimit)