LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -verify tests for older ccache versions

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287109 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-11-16 14:48:42 +00:00
parent 18e2c824b4
commit 3dd27eb62c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/libcxx/test/format.py
View File

@@ -37,6 +37,11 @@ class LibcxxTestFormat(object):
self.execute_external = execute_external self.execute_external = execute_external
self.executor = executor self.executor = executor
self.exec_env = dict(exec_env) self.exec_env = dict(exec_env)
self.compile_env = dict(os.environ)
# 'CCACHE_CPP2' prevents ccache from stripping comments while
# preprocessing. This is required to prevent stripping of '-verify'
# comments.
self.compile_env['CCACHE_CPP2'] = '1'
# TODO: Move this into lit's FileBasedTest # TODO: Move this into lit's FileBasedTest
def getTestsInDirectory(self, testSuite, path_in_suite, def getTestsInDirectory(self, testSuite, path_in_suite,
@@ -127,7 +132,7 @@ class LibcxxTestFormat(object):
# Compile the test # Compile the test
cmd, out, err, rc = self.cxx.compileLinkTwoSteps( cmd, out, err, rc = self.cxx.compileLinkTwoSteps(
source_path, out=exec_path, object_file=object_path, source_path, out=exec_path, object_file=object_path,
cwd=execDir) cwd=execDir, env=self.compile_env)
compile_cmd = cmd compile_cmd = cmd
if rc != 0: if rc != 0:
report = libcxx.util.makeReport(cmd, out, err, rc) report = libcxx.util.makeReport(cmd, out, err, rc)
@@ -187,7 +192,8 @@ class LibcxxTestFormat(object):
cmd, out, err, rc = self.cxx.compile(source_path, out=os.devnull, cmd, out, err, rc = self.cxx.compile(source_path, out=os.devnull,
flags=extra_flags, flags=extra_flags,
disable_ccache=True, disable_ccache=True,
enable_warnings=False) enable_warnings=False,
env=self.compile_env)
expected_rc = 0 if use_verify else 1 expected_rc = 0 if use_verify else 1
if rc == expected_rc: if rc == expected_rc:
return lit.Test.PASS, '' return lit.Test.PASS, ''