[libcxx] r314755 - Fix test suite misconfiguration on OS X

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Mon Oct 2 19:25:05 PDT 2017


Author: ericwf
Date: Mon Oct  2 19:25:05 2017
New Revision: 314755

URL: http://llvm.org/viewvc/llvm-project?rev=314755&view=rev
Log:
Fix test suite misconfiguration on OS X

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

Modified: libcxx/trunk/utils/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/libcxx/test/config.py?rev=314755&r1=314754&r2=314755&view=diff
==============================================================================
--- libcxx/trunk/utils/libcxx/test/config.py (original)
+++ libcxx/trunk/utils/libcxx/test/config.py Mon Oct  2 19:25:05 2017
@@ -478,8 +478,8 @@ class Configuration(object):
 
         # Attempt to detect the glibc version by querying for __GLIBC__
         # in 'features.h'.
-        macros = self._dump_macros_verbose(flags=['-include', 'features.h'])
-        if macros is not None and '__GLIBC__' in macros:
+        macros = self.cxx.dumpMacros(flags=['-include', 'features.h'])
+        if isinstance(macros, dict) and '__GLIBC__' in macros:
             maj_v, min_v = (macros['__GLIBC__'], macros['__GLIBC_MINOR__'])
             self.config.available_features.add('glibc')
             self.config.available_features.add('glibc-%s' % maj_v)




More information about the cfe-commits mailing list