Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-24 20:44:09 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[libc++] Get rid of the %{libcxx_src_root} substitution

Browse Source 
This reduces the set of substitutions required to run the test suite.
This commit is contained in:
Louis Dionne 2020-07-09 15:15:26 -04:00
parent 25ec96d91a
commit 389b67b809
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp
View File

@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03
// ADDITIONAL_COMPILE_FLAGS: -I%{libcxx_src_root}/src/filesystem
// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../../../src/filesystem
// <filesystem>

2
libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp
View File

@ -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 <filesystem>
#include <chrono>

2
libcxx/test/pretty_printers/gdb_pretty_printer_test.sh.cpp
View File

@ -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 <bitset>
#include <deque>

6
libcxx/utils/libcxx/test/config.py
View File

@ -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 = [