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

test: Make it possible to opt in to use_clang_verify per test

Browse Source 
This modifies the use_clang_verify parameter I added in r217009 to
only apply to tests that specifically ask for it via // USE_VERIFY.
This allows us to incrementally convert tests, but start enjoying the
benefits right away.

Suggested by Eric Fiselier in code review.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217017 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner 2014-09-03 06:01:52 +00:00
parent 438d2cb25d
commit 464da3b76c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/lit.cfg
View File

@ -67,6 +67,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
# Extract test metadata from the test file. # Extract test metadata from the test file.
requires = [] requires = []
unsupported = [] unsupported = []
use_verify = False
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:
@ -78,6 +79,8 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
elif 'UNSUPPORTED:' in ln: elif 'UNSUPPORTED:' in ln:
items = ln[ln.index('UNSUPPORTED:') + 12:].split(',') items = ln[ln.index('UNSUPPORTED:') + 12:].split(',')
unsupported.extend([s.strip() for s in items]) unsupported.extend([s.strip() for s in items])
elif 'USE_VERIFY' in ln and self.use_verify_for_fail:
use_verify = True
elif not ln.strip().startswith("//") and ln.strip(): elif not ln.strip().startswith("//") and ln.strip():
# Stop at the first non-empty line that is not a C++ # Stop at the first non-empty line that is not a C++
# comment. # comment.
@ -103,9 +106,9 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
', '.join(unsupported_features),)) ', '.join(unsupported_features),))
# Evaluate the test. # Evaluate the test.
return self._evaluate_test(test, lit_config) return self._evaluate_test(test, use_verify, lit_config)
def _evaluate_test(self, test, lit_config): def _evaluate_test(self, test, use_verify, lit_config):
name = test.path_in_suite[-1] name = test.path_in_suite[-1]
source_path = test.getSourcePath() source_path = test.getSourcePath()
source_dir = os.path.dirname(source_path) source_dir = os.path.dirname(source_path)
@ -119,7 +122,7 @@ class LibcxxTestFormat(lit.formats.FileBasedTest):
cmd = [self.cxx_under_test, '-c', cmd = [self.cxx_under_test, '-c',
'-o', '/dev/null', source_path] + self.cpp_flags '-o', '/dev/null', source_path] + self.cpp_flags
expected_rc = 1 expected_rc = 1
if self.use_verify_for_fail: if use_verify:
cmd += ['-Xclang', '-verify'] cmd += ['-Xclang', '-verify']
expected_rc = 0 expected_rc = 0
out, err, rc = self.execute_command(cmd) out, err, rc = self.execute_command(cmd)

2
test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.fail.cpp
View File

@ -15,6 +15,8 @@
// default unique_ptr ctor should require default Deleter ctor // default unique_ptr ctor should require default Deleter ctor
// USE_VERIFY
#include <memory> #include <memory>
class Deleter class Deleter