[libc++] Use braces around %file_dependencies substitution

This one was left out from a previous commit.

diff --git a/libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp b/libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp
index b850b44..1d85b60 100644 (file)
--- a/libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp
+++ b/libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp
@@ -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'

diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 66e60cd..d53bd6c 100644 (file)
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -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))

diff --git a/libcxx/utils/libcxx/test/format.py b/libcxx/utils/libcxx/test/format.py
index b5046ab..0e6ec5d 100644 (file)
--- a/libcxx/utils/libcxx/test/format.py
+++ b/libcxx/utils/libcxx/test/format.py
@@ -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)