Modularize TargetInfo discovery in the lit config

When the remote execution patch lands, this will allow us to drop in a
replacement TargetInfo object for locale support discovery, alleviating
the assumption that host==target.

http://reviews.llvm.org/D7601


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@229111 91177308-0d34-0410-b5e6-96231b3b80d8

test/CMakeLists.txt

@@ -44,6 +44,8 @@ if (LIT_EXECUTABLE)
   pythonize_bool(LIBCXX_BUILD_32_BITS)
   pythonize_bool(LIBCXX_ENABLE_THREADS)
   pythonize_bool(LIBCXX_ENABLE_MONOTONIC_CLOCK)
+  set(LIBCXX_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
+      "TargetInfo to use when setting up test environment.")
 
   set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
 

test/libcxx/test/config.py

@@ -1,3 +1,4 @@
+import importlib
 import locale
 import os
 import platform
@@ -57,9 +58,6 @@ class Configuration(object):
         self.long_tests = None
         self.execute_external = False
 
-        if platform.system() not in ('Darwin', 'FreeBSD', 'Linux'):
-            self.lit_config.fatal("unrecognized system")
-
     def get_lit_conf(self, name, default=None):
         val = self.lit_config.params.get(name, None)
         if val is None:
@@ -80,6 +78,7 @@ class Configuration(object):
             "parameter '{}' should be true or false".format(name))
 
     def configure(self):
+        self.configure_target_info()
         self.configure_cxx()
         self.configure_triple()
         self.configure_src_root()
@@ -109,6 +108,15 @@ class Configuration(object):
                              list(self.config.available_features))
         self.lit_config.note('Using environment: %r' % self.env)
 
+    def configure_target_info(self):
+        default = "libcxx.test.target_info.LocalTI"
+        info_str = self.get_lit_conf('target_info', default)
+        mod_path, _, info = info_str.rpartition('.')
+        mod = importlib.import_module(mod_path)
+        self.target_info = getattr(mod, info)()
+        if info_str != default:
+            self.lit_config.note("inferred target_info as: %r" % info_str)
+
     def get_test_format(self):
         return LibcxxTestFormat(
             self.cxx,
@@ -237,17 +245,25 @@ class Configuration(object):
             },
         }
 
-        default_locale = locale.setlocale(locale.LC_ALL)
+        target_system = self.target_info.system()
-        for feature, loc in locales[platform.system()].items():
+        target_platform = self.target_info.platform()
-            try:
+
-                locale.setlocale(locale.LC_ALL, loc)
+        if target_system in locales:
-                self.config.available_features.add(
+            default_locale = locale.setlocale(locale.LC_ALL)
-                    'locale.{0}'.format(feature))
+            for feature, loc in locales[target_system].items():
-            except locale.Error:
+                try:
-                self.lit_config.warning('The locale {0} is not supported by '
+                    locale.setlocale(locale.LC_ALL, loc)
-                                        'your platform. Some tests will be '
+                    self.config.available_features.add(
-                                        'unsupported.'.format(loc))
+                        'locale.{0}'.format(feature))
-        locale.setlocale(locale.LC_ALL, default_locale)
+                except locale.Error:
+                    self.lit_config.warning('The locale {0} is not supported by '
+                                            'your platform. Some tests will be '
+                                            'unsupported.'.format(loc))
+            locale.setlocale(locale.LC_ALL, default_locale)
+        else:
+            # Warn that the user doesn't get any free XFAILs for locale issues
+            self.lit_config.warning("No locales entry for target_system: %s" %
+                                    target_system)
 
         # Write an "available feature" that combines the triple when
         # use_system_cxx_lib is enabled. This is so that we can easily write
@@ -258,20 +274,14 @@ class Configuration(object):
                 'with_system_cxx_lib=%s' % self.config.target_triple)
 
         # Insert the platform name into the available features as a lower case.
-        # Strip the '2' from linux2.
+        self.config.available_features.add(target_platform)
-        if sys.platform.startswith('linux'):
-            platform_name = 'linux'
-        else:
-            platform_name = sys.platform
-        self.config.available_features.add(platform_name.lower())
 
         # Some linux distributions have different locale data than others.
         # Insert the distributions name and name-version into the available
         # features to allow tests to XFAIL on them.
-        if sys.platform.startswith('linux'):
+        if target_platform == 'linux':
-            name, ver, _ = platform.linux_distribution()
+            name = self.target_info.platform_name()
-            name = name.lower().strip()
+            ver = self.target_info.platform_ver()
-            ver = ver.lower().strip()
             if name:
                 self.config.available_features.add(name)
             if name and ver:
@@ -439,9 +449,10 @@ class Configuration(object):
     def configure_extra_library_flags(self):
         enable_threads = self.get_lit_bool('enable_threads', True)
         llvm_unwinder = self.get_lit_bool('llvm_unwinder', False)
-        if sys.platform == 'darwin':
+        target_platform = self.target_info.platform()
+        if target_platform == 'darwin':
             self.cxx.link_flags += ['-lSystem']
-        elif sys.platform.startswith('linux'):
+        elif target_platform == 'linux':
             if not llvm_unwinder:
                 self.cxx.link_flags += ['-lgcc_eh']
             self.cxx.link_flags += ['-lc', '-lm']
@@ -452,10 +463,10 @@ class Configuration(object):
                 self.cxx.link_flags += ['-lunwind', '-ldl']
             else:
                 self.cxx.link_flags += ['-lgcc_s']
-        elif sys.platform.startswith('freebsd'):
+        elif target_platform.startswith('freebsd'):
             self.cxx.link_flags += ['-lc', '-lm', '-lpthread', '-lgcc_s']
         else:
-            self.lit_config.fatal("unrecognized system: %r" % sys.platform)
+            self.lit_config.fatal("unrecognized system: %r" % target_platform)
 
     def configure_warnings(self):
         enable_warnings = self.get_lit_bool('enable_warnings', False)
@@ -480,7 +491,7 @@ class Configuration(object):
                                              symbolizer_search_paths)
             # Setup the sanitizer compile flags
             self.cxx.flags += ['-g', '-fno-omit-frame-pointer']
-            if sys.platform.startswith('linux'):
+            if self.target_info.platform() == 'linux':
                 self.cxx.link_flags += ['-ldl']
             if san == 'Address':
                 self.cxx.flags += ['-fsanitize=address']

test/libcxx/test/target_info.py

@@ -0,0 +1,55 @@
+import locale
+import platform
+import sys
+
+class TargetInfo(object):
+    def platform(self):
+        raise NotImplementedError
+
+    def system(self):
+        raise NotImplementedError
+
+    def platform_ver(self):
+        raise NotImplementedError
+
+    def platform_name(self):
+        raise NotImplementedError
+
+    def supports_locale(self, loc):
+        raise NotImplementedError
+
+
+class LocalTI(TargetInfo):
+    def platform(self):
+        platform_name = sys.platform.lower().strip()
+        # Strip the '2' from linux2.
+        if platform_name.startswith('linux'):
+            platform_name = 'linux'
+        return platform_name
+
+    def system(self):
+        return platform.system()
+
+    def platform_name(self):
+        if platform() == 'linux':
+            name, _, _ = platform.linux_distribution()
+            name = name.lower().strip()
+            if name:
+                return name
+        return None
+
+    def platform_ver(self):
+        if platform() == 'linux':
+            _, ver, _ = platform.linux_distribution()
+            ver = ver.lower().strip()
+            if ver:
+                return ver
+        return None
+
+    def supports_locale(self, loc):
+        try:
+            locale.setlocale(locale.LC_ALL, loc)
+            return True
+        except locale.Error:
+            return False
+

test/lit.site.cfg.in

@@ -17,6 +17,7 @@ config.configuration_variant    = "@LIBCXX_LIT_VARIANT@"
 config.target_triple            = "@LIBCXX_TARGET_TRIPLE@"
 config.sysroot                  = "@LIBCXX_SYSROOT@"
 config.gcc_toolchain            = "@LIBCXX_GCC_TOOLCHAIN@"
+config.target_info              = "@LIBCXX_TARGET_INFO@"
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LIBCXX_SOURCE_DIR@/test/lit.cfg")