From dd2fe4de1df6de8a875798eed8187be91e88a32c Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 26 Oct 2015 19:08:53 +0000 Subject: [PATCH] Fix test suite configuration. Sorry Marshall git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@251334 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/libcxx/test/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py index 07e4bdc0..b71b0517 100644 --- a/test/libcxx/test/config.py +++ b/test/libcxx/test/config.py @@ -197,7 +197,7 @@ class Configuration(object): def configure_obj_root(self): self.project_obj_root = self.get_lit_conf('project_obj_root') self.libcxx_obj_root = self.get_lit_conf('libcxx_obj_root') - if not self.libcxx_obj_root: + if not self.libcxx_obj_root and self.project_obj_root is not None: possible_root = os.path.join(self.project_obj_root, 'projects', 'libcxx') if os.path.isdir(possible_root): self.libcxx_obj_root = possible_root @@ -425,6 +425,8 @@ class Configuration(object): def configure_config_site_header(self): # Check for a possible __config_site in the build directory. We # use this if it exists. + if self.libcxx_obj_root is None: + return config_site_header = os.path.join(self.libcxx_obj_root, '__config_site') if not os.path.isfile(config_site_header): return