generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[tests] Update to use lit's now-integrated XFAIL handling.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@188960 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2013-08-21 23:06:32 +00:00
parent 5c316a6d04
commit 585b48ddf6
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/lit.cfg
View File

@ -16,27 +16,6 @@ import lit.Test
import lit.formats import lit.formats
import lit.util import lit.util
# FIXME: For now, this is cribbed from lit.TestRunner, to avoid introducing a
# dependency there. What we more ideally would like to do is lift the "xfail"
# and "requires" handling to be a core lit framework feature.
def isExpectedFail(test, xfails):
# Check if any of the xfails match an available feature or the target.
for item in xfails:
# If this is the wildcard, it always fails.
if item == '*':
return True
# If this is a part of any of the features, it fails.
for feature in test.config.available_features:
if item in feature:
return True
# If this is a part of the target triple, it fails.
if item in test.suite.config.target_triple:
return True
return False
class LibcxxTestFormat(lit.formats.FileBasedTest): class LibcxxTestFormat(lit.formats.FileBasedTest):
""" """
Custom test format handler for use with the test format use by libc++. Custom test format handler for use with the test format use by libc++.
@ -82,13 +61,12 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
def _execute(self, test, lit_config): def _execute(self, test, lit_config):
# Extract test metadata from the test file. # Extract test metadata from the test file.
xfails = []
requires = [] requires = []
with open(test.getSourcePath()) as f: with open(test.getSourcePath()) as f:
for ln in f: for ln in f:
if 'XFAIL:' in ln: if 'XFAIL:' in ln:
items = ln[ln.index('XFAIL:') + 6:].split(',') items = ln[ln.index('XFAIL:') + 6:].split(',')
xfails.extend([s.strip() for s in items]) test.xfails.extend([s.strip() for s in items])
elif 'REQUIRES:' in ln: elif 'REQUIRES:' in ln:
items = ln[ln.index('REQUIRES:') + 9:].split(',') items = ln[ln.index('REQUIRES:') + 9:].split(',')
requires.extend([s.strip() for s in items]) requires.extend([s.strip() for s in items])
@ -101,8 +79,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
# #
# FIXME: For now, this is cribbed from lit.TestRunner, to avoid # FIXME: For now, this is cribbed from lit.TestRunner, to avoid
# introducing a dependency there. What we more ideally would like to do # introducing a dependency there. What we more ideally would like to do
# is lift the "xfail" and "requires" handling to be a core lit # is lift the "requires" handling to be a core lit framework feature.
# framework feature.
missing_required_features = [f for f in requires missing_required_features = [f for f in requires
if f not in test.config.available_features] if f not in test.config.available_features]
if missing_required_features: if missing_required_features:
@ -110,21 +87,8 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
"Test requires the following features: %s" % ( "Test requires the following features: %s" % (
', '.join(missing_required_features),)) ', '.join(missing_required_features),))
# Determine if this test is an expected failure.
isXFail = isExpectedFail(test, xfails)
# Evaluate the test. # Evaluate the test.
result, report = self._evaluate_test(test, lit_config) return self._evaluate_test(test, lit_config)
# Convert the test result based on whether this is an expected failure.
if isXFail:
if result != lit.Test.FAIL:
report += "\n\nTest was expected to FAIL, but did not.\n"
result = lit.Test.XPASS
else:
result = lit.Test.XFAIL
return result, report
def _evaluate_test(self, test, lit_config): def _evaluate_test(self, test, lit_config):
name = test.path_in_suite[-1] name = test.path_in_suite[-1]