diff options
| author | Jonathan Roelofs <jonathan@codesourcery.com> | 2015-01-15 00:03:14 +0000 |
|---|---|---|
| committer | Jonathan Roelofs <jonathan@codesourcery.com> | 2015-01-15 00:03:14 +0000 |
| commit | 015cf55c71719d5e816e9712f90968aa76951ec7 (patch) | |
| tree | d87f3faa0255d1f566d5ef0653a034df1046a3a7 /libcxx/test | |
| parent | 02d87608c166b25f3435128dea94866fee8a519b (diff) | |
| download | bcm5719-llvm-015cf55c71719d5e816e9712f90968aa76951ec7.tar.gz bcm5719-llvm-015cf55c71719d5e816e9712f90968aa76951ec7.zip | |
Rename src_root -> libcxx_src_root. NFC
llvm-svn: 226063
Diffstat (limited to 'libcxx/test')
| -rw-r--r-- | libcxx/test/libcxx/test/config.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py index 3e7a3d64f49..5c97b94ed6a 100644 --- a/libcxx/test/libcxx/test/config.py +++ b/libcxx/test/libcxx/test/config.py @@ -17,7 +17,7 @@ class Configuration(object): self.lit_config = lit_config self.config = config self.cxx = None - self.src_root = None + self.libcxx_src_root = None self.obj_root = None self.cxx_library_root = None self.env = {} @@ -137,11 +137,12 @@ class Configuration(object): compiler_name, major_ver, minor_ver)) def configure_src_root(self): - self.src_root = self.get_lit_conf( + self.libcxx_src_root = self.get_lit_conf( 'libcxx_src_root', os.path.dirname(self.config.test_source_root)) def configure_obj_root(self): - self.obj_root = self.get_lit_conf('libcxx_obj_root', self.src_root) + self.obj_root = self.get_lit_conf('libcxx_obj_root', + self.libcxx_src_root) def configure_cxx_library_root(self): self.cxx_library_root = self.get_lit_conf('cxx_library_root', @@ -297,9 +298,9 @@ class Configuration(object): self.compile_flags += shlex.split(compile_flags_str) def configure_compile_flags_header_includes(self): - self.compile_flags += ['-I' + self.src_root + '/test/support'] + self.compile_flags += ['-I' + self.libcxx_src_root + '/test/support'] libcxx_headers = self.get_lit_conf('libcxx_headers', - self.src_root + '/include') + self.libcxx_src_root + '/include') if not os.path.isdir(libcxx_headers): self.lit_config.fatal("libcxx_headers='%s' is not a directory." % libcxx_headers) |
