llvm-project Mega-Update

tests/libcxx/lit.site.cfg.in

@@ -17,6 +17,7 @@ config.suffixes         = ['[.]pass[.]cpp$', '[.]fail[.]cpp$']
 config.test_exec_root   = '@LIBCXX_TEST_OUTPUT_DIR@'
 config.test_format      = stl.test.format.LibcxxTestFormat()
 config.test_source_root = '@LIBCXX_SOURCE_DIR@/test'
+config.substitutions.append(('%{cxx_std}', ''))
 
 lit_config.expected_results = getattr(lit_config, 'expected_results', dict())
 lit_config.include_dirs     = getattr(lit_config, 'include_dirs', dict())

tests/std/lit.site.cfg.in

@@ -15,6 +15,7 @@ config.name           = 'std'
 config.suffixes       = ['test[.]cpp$', 'test[.]compile[.]pass[.]cpp$']
 config.test_exec_root = "@STD_TEST_OUTPUT_DIR@"
 config.test_format    = stl.test.format.STLTestFormat()
+config.substitutions.append(('%{cxx_std}', ''))
 
 lit_config.expected_results = getattr(lit_config, 'expected_results', dict())
 lit_config.include_dirs     = getattr(lit_config, 'include_dirs', dict())

tests/tr1/lit.site.cfg.in

@@ -15,6 +15,7 @@ config.name           = 'tr1'
 config.suffixes       = ['test[.]cpp$']
 config.test_exec_root = "@TR1_TEST_OUTPUT_DIR@"
 config.test_format    = stl.test.format.STLTestFormat()
+config.substitutions.append(('%{cxx_std}', ''))
 
 lit_config.expected_results = getattr(lit_config, 'expected_results', dict())
 lit_config.include_dirs     = getattr(lit_config, 'include_dirs', dict())

tests/utils/stl/test/features.py

@@ -22,7 +22,11 @@ def hasLocale(loc):
         locale.setlocale(locale.LC_ALL, default_locale)
 
 def getDefaultFeatures(config, litConfig):
-    DEFAULT_FEATURES = [Feature(name='msvc'), Feature(name='windows')]
+    DEFAULT_FEATURES = [
+        Feature(name='has-64-bit-atomics'),
+        Feature(name='msvc'),
+        Feature(name='windows'),
+    ]
     locales = {
       'en_US.UTF-8':     ['en_US.UTF-8', 'en_US.utf8', 'English_United States.1252'],
       'fr_FR.UTF-8':     ['fr_FR.UTF-8', 'fr_FR.utf8', 'French_France.1252'],

tests/utils/stl/test/tests.py

@@ -99,10 +99,18 @@ def _parseTest(self):
                                                        lit.TestRunner.ParserKind.LIST,
                                                        initial_value=fileDependencies),
             lit.TestRunner.IntegratedTestKeywordParser('ADDITIONAL_COMPILE_FLAGS:',
-                                                       lit.TestRunner.ParserKind.LIST,
+                                                       lit.TestRunner.ParserKind.SPACE_LIST,
                                                        initial_value=additionalCompileFlags)
         ]
 
+        for feature in self.config.available_features:
+            parser = lit.TestRunner.IntegratedTestKeywordParser(
+                "ADDITIONAL_COMPILE_FLAGS({}):".format(feature),
+                lit.TestRunner.ParserKind.SPACE_LIST,
+                initial_value=additionalCompileFlags,
+            )
+            parsers.append(parser)
+
         lit.TestRunner.parseIntegratedTestScript(self, additional_parsers=parsers, require_script=False)
         self.compileFlags.extend(additionalCompileFlags)
         self.fileDependencies.extend(fileDependencies)
@@ -214,6 +222,7 @@ def _handleEnvlst(self, litConfig):
 
         if ('clang'.casefold() in os.path.basename(cxx).casefold()):
             self._addCustomFeature('clang')
+            self._addCustomFeature('gcc-style-warnings')
 
             targetArch = litConfig.target_arch.casefold()
             if (targetArch == 'x64'.casefold()):
@@ -230,7 +239,7 @@ def _handleEnvlst(self, litConfig):
             # nvcc only supports targeting x64
             self.requires.append('x64')
         else:
-            self._addCustomFeature('cl')
+            self._addCustomFeature('cl-style-warnings')
 
         self.cxx = os.path.normpath(cxx)
         return None