<div dir="ltr">Thanks for the fix.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 28, 2015 at 11:20 AM, Matthias Braun via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: matze<br>
Date: Wed Oct 28 12:20:33 2015<br>
New Revision: 251529<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=251529&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=251529&view=rev</a><br>
Log:<br>
Adapt to lit change in llvm r251478-r251481<br>
<br>
Sorry for the breakage.<br>
<br>
Modified:<br>
libcxx/trunk/test/libcxx/test/format.py<br>
<br>
Modified: libcxx/trunk/test/libcxx/test/format.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/format.py?rev=251529&r1=251528&r2=251529&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/format.py?rev=251529&r1=251528&r2=251529&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/test/libcxx/test/format.py (original)<br>
+++ libcxx/trunk/test/libcxx/test/format.py Wed Oct 28 12:20:33 2015<br>
@@ -64,20 +64,24 @@ class LibcxxTestFormat(object):<br>
return (lit.Test.UNSUPPORTED,<br>
"A lit.local.cfg marked this unsupported")<br>
<br>
- res = lit.TestRunner.parseIntegratedTestScript(<br>
+ script = lit.TestRunner.parseIntegratedTestScript(<br>
test, require_script=is_sh_test)<br>
# Check if a result for the test was returned. If so return that<br>
# result.<br>
- if isinstance(res, lit.Test.Result):<br>
- return res<br>
+ if isinstance(script, lit.Test.Result):<br>
+ return script<br>
if lit_config.noExecute:<br>
return lit.Test.Result(lit.Test.PASS)<br>
- # res is not an instance of lit.test.Result. Expand res into its parts.<br>
- script, tmpBase, execDir = res<br>
+<br>
# Check that we don't have run lines on tests that don't support them.<br>
if not is_sh_test and len(script) != 0:<br>
lit_config.fatal('Unsupported RUN line found in test %s' % name)<br>
<br>
+ tmpDir, tmpBase = lit.TestRunner.getTempPaths(test)<br>
+ substitutions = lit.TestRunner.getDefaultSubstitutions(test, tmpDir,<br>
+ tmpBase)<br>
+ script = lit.TestRunner.applySubstitutions(script, substitutions)<br>
+<br>
# Dispatch the test based on its suffix.<br>
if is_sh_test:<br>
if not isinstance(self.executor, LocalExecutor):<br>
@@ -86,11 +90,11 @@ class LibcxxTestFormat(object):<br>
return lit.Test.UNSUPPORTED, 'ShTest format not yet supported'<br>
return lit.TestRunner._runShTest(test, lit_config,<br>
self.execute_external, script,<br>
- tmpBase, execDir)<br>
+ tmpBase)<br>
elif is_fail_test:<br>
return self._evaluate_fail_test(test)<br>
elif is_pass_test:<br>
- return self._evaluate_pass_test(test, tmpBase, execDir, lit_config)<br>
+ return self._evaluate_pass_test(test, tmpBase, lit_config)<br>
else:<br>
# No other test type is supported<br>
assert False<br>
@@ -98,7 +102,8 @@ class LibcxxTestFormat(object):<br>
def _clean(self, exec_path): # pylint: disable=no-self-use<br>
libcxx.util.cleanFile(exec_path)<br>
<br>
- def _evaluate_pass_test(self, test, tmpBase, execDir, lit_config):<br>
+ def _evaluate_pass_test(self, test, tmpBase, lit_config):<br>
+ execDir = os.path.dirname(test.getExecPath())<br>
source_path = test.getSourcePath()<br>
exec_path = tmpBase + '.exe'<br>
object_path = tmpBase + '.o'<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>