[libcxx-commits] [libcxx] e9a2caf - [libc++] Use braces around %file_dependencies substitution

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-03-27T11:33:25-04:00
New Revision: e9a2caf34c0c65cf65dcd2e63c58390d37732246

URL: https://github.com/llvm/llvm-project/commit/e9a2caf34c0c65cf65dcd2e63c58390d37732246
DIFF: https://github.com/llvm/llvm-project/commit/e9a2caf34c0c65cf65dcd2e63c58390d37732246.diff

LOG: [libc++] Use braces around %file_dependencies substitution

This one was left out from a previous commit.

Added: 
    

Modified: 
    libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp
    libcxx/utils/libcxx/test/config.py
    libcxx/utils/libcxx/test/format.py

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp b/libcxx/test/libcxx/selftest/test.file_dependencies.sh.cpp
index b850b44b2bfe..1d85b6021acc 100644
--- 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 66e60cd75cf3..d53bd6cbeb36 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -1065,7 +1065,7 @@ def configure_substitutions(self):
         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 b5046aba1ca4..0e6ec5d39e19 100644
--- a/libcxx/utils/libcxx/test/format.py
+++ b/libcxx/utils/libcxx/test/format.py
@@ -123,7 +123,7 @@ def _execute(self, test, lit_config):
         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)