Print lit configuration information after all configuration is done.
authorEric Fiselier <eric@efcs.ca>
Mon, 24 Nov 2014 23:46:42 +0000 (23:46 +0000)
committerEric Fiselier <eric@efcs.ca>
Mon, 24 Nov 2014 23:46:42 +0000 (23:46 +0000)
llvm-svn: 222711

libcxx/test/lit.cfg

index 475e78c..dc72b46 100644 (file)
@@ -217,9 +217,8 @@ class Configuration(object):
         self.src_root = None
         self.obj_root = None
         self.env = {}
-        self.compile_flags = []
-        self.library_paths = []
-        self.link_flags = []
+        self.compile_flags = ['-nostdinc++']
+        self.link_flags = ['-nodefaultlibs']
         self.use_system_lib = False
         self.use_clang_verify = False
 
@@ -258,13 +257,19 @@ class Configuration(object):
         self.configure_link_flags()
         self.configure_sanitizer()
         self.configure_features()
+        # Print the final compile and link flags.
+        self.lit_config.note('Using compile flags: %s' % self.compile_flags)
+        self.lit_config.note('Using link flags: %s' % self.link_flags)
+        # Print as list to prevent "set([...])" from being printed.
+        self.lit_config.note('Using available_features: %s' %
+                             list(self.config.available_features))
 
     def get_test_format(self):
         return LibcxxTestFormat(
             self.cxx,
             self.use_clang_verify,
-            cpp_flags=['-nostdinc++'] + self.compile_flags,
-            ld_flags=['-nodefaultlibs'] + self.link_flags,
+            cpp_flags=self.compile_flags,
+            ld_flags=self.link_flags,
             exec_env=self.env)
 
     def configure_cxx(self):
@@ -436,8 +441,6 @@ class Configuration(object):
             else:
                 self.lit_config.fatal("unrecognized system: %r" % sys.platform)
 
-            self.lit_config.note(
-                "inferred link_flags as: %r" % self.link_flags)
         if link_flags_str:
             self.link_flags += shlex.split(link_flags_str)