[libcxx] r251334 - Fix test suite configuration. Sorry Marshall

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Mon Oct 26 14:08:53 2015
New Revision: 251334

URL: http://llvm.org/viewvc/llvm-project?rev=251334&view=rev
Log:
Fix test suite configuration. Sorry Marshall

Modified:
    libcxx/trunk/test/libcxx/test/config.py

Modified: libcxx/trunk/test/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=251334&r1=251333&r2=251334&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/test/config.py (original)
+++ libcxx/trunk/test/libcxx/test/config.py Mon Oct 26 14:08:53 2015
@@ -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