From 389b67b809cd75470819d69102d62bb316d15967 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 9 Jul 2020 15:15:26 -0400 Subject: [PATCH] [libc++] Get rid of the %{libcxx_src_root} substitution This reduces the set of substitutions required to run the test suite. --- .../directory_entry.mods/last_write_time.pass.cpp | 2 +- .../input.output/filesystems/convert_file_time.pass.cpp | 2 +- libcxx/test/pretty_printers/gdb_pretty_printer_test.sh.cpp | 2 +- libcxx/utils/libcxx/test/config.py | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp index b7f2f07b31a4..5a5735934e95 100644 --- a/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp +++ b/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03 -// ADDITIONAL_COMPILE_FLAGS: -I%{libcxx_src_root}/src/filesystem +// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../../../src/filesystem // diff --git a/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp index b0740bb6374c..9e406b00f5c1 100644 --- a/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp +++ b/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp @@ -13,7 +13,7 @@ // typedef TrivialClock file_time_type; -// ADDITIONAL_COMPILE_FLAGS: -I%{libcxx_src_root}/src/filesystem +// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../src/filesystem #include #include diff --git a/libcxx/test/pretty_printers/gdb_pretty_printer_test.sh.cpp b/libcxx/test/pretty_printers/gdb_pretty_printer_test.sh.cpp index 96cdd2016a69..081e778540a0 100644 --- a/libcxx/test/pretty_printers/gdb_pretty_printer_test.sh.cpp +++ b/libcxx/test/pretty_printers/gdb_pretty_printer_test.sh.cpp @@ -10,7 +10,7 @@ // // RUN: %{cxx} %{flags} %s -o %t.exe %{compile_flags} -g %{link_flags} // Ensure locale-independence for unicode tests. -// RUN: %{libcxx_gdb} -nx -batch -iex "set autoload off" -ex "source %{libcxx_src_root}/utils/gdb/libcxx/printers.py" -ex "python register_libcxx_printer_loader()" -ex "source %{libcxx_src_root}/test/pretty_printers/gdb_pretty_printer_test.py" %t.exe +// RUN: %{libcxx_gdb} -nx -batch -iex "set autoload off" -ex "source %S/../../utils/gdb/libcxx/printers.py" -ex "python register_libcxx_printer_loader()" -ex "source %S/gdb_pretty_printer_test.py" %t.exe #include #include diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 6015a00acb0d..99a966dbfdfd 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -649,19 +649,13 @@ class Configuration(object): def configure_substitutions(self): sub = self.config.substitutions - # Configure compiler substitutions sub.append(('%{cxx}', pipes.quote(self.cxx.path))) - sub.append(('%{libcxx_src_root}', self.libcxx_src_root)) - # Configure flags substitutions flags = self.cxx.flags + (self.cxx.modules_flags if self.cxx.use_modules else []) compile_flags = self.cxx.compile_flags + (self.cxx.warning_flags if self.cxx.use_warnings else []) sub.append(('%{flags}', ' '.join(map(pipes.quote, flags)))) sub.append(('%{compile_flags}', ' '.join(map(pipes.quote, compile_flags)))) sub.append(('%{link_flags}', ' '.join(map(pipes.quote, self.cxx.link_flags)))) sub.append(('%{link_libcxxabi}', pipes.quote(self.cxx.link_libcxxabi_flag))) - - # Configure exec prefix substitutions. - # Configure run env substitution. codesign_ident = self.get_lit_conf('llvm_codesign_identity', '') env_vars = ' '.join('%s=%s' % (k, pipes.quote(v)) for (k, v) in self.exec_env.items()) exec_args = [