<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Ben Gamari pushed to branch wip/junit-fixes
at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/b3d40b1818911a568ed25df4256cf2169b9e126e">b3d40b18</a></strong>
<div>
<span>by Ben Gamari</span>
<i>at 2019-06-24T01:36:09Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Fix
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#c591f85f122007bac88228c5ff6fd76b40e6a811">
testsuite/driver/testlib.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="c591f85f122007bac88228c5ff6fd76b40e6a811">
<a href="https://gitlab.haskell.org/ghc/ghc/commit/b3d40b1818911a568ed25df4256cf2169b9e126e#c591f85f122007bac88228c5ff6fd76b40e6a811"><strong>testsuite/driver/testlib.py</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1782" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1782" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -1782,8 +1782,8 @@ def compare_outputs(way: WayName,</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1782" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1782
</td>
<td class="diff-line-num new_line" data-linenumber="1782" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1782
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1782" class="line" lang="python"> <span class="n" style="color: #333;">actual_normalised_path</span><span class="p">),</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1783" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1783
</td>
<td class="diff-line-num new_line" data-linenumber="1783" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1783
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1783" class="line" lang="python"> <span class="n" style="color: #333;">stdout</span><span class="o" style="font-weight: 600;">=</span><span class="n" style="color: #333;">diff_file</span><span class="p">,</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1784" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1784
</td>
<td class="diff-line-num new_line" data-linenumber="1784" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1784
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1784" class="line" lang="python"> <span class="n" style="color: #333;">print_output</span><span class="o" style="font-weight: 600;">=</span><span class="bp" style="color: #999;">True</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="1785" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1785
</td>
<td class="diff-line-num new_line old" data-linenumber="1785" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1785" class="line" lang="python"> <span class="k" style="font-weight: 600;">elif</span> <span class="n" style="color: #333;">diff_file</span><span class="p">:</span> <span class="nb" style="color: #0086b3;"><span class="idiff left">open</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">diff_file</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff right"> </span><span class="s" style="color: #d14;">'ab'</span><span class="p">)</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">close</span><span class="p">()</span> <span class="c1" style="color: #998; font-style: italic;"># Make sure the file exists still as</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="1786" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1786
</td>
<td class="diff-line-num new_line old" data-linenumber="1785" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1786" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># we will try to read it later</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="1787" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1785" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1785
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1785" class="line" lang="python"> <span class="k" style="font-weight: 600;">elif</span> <span class="n" style="color: #333;">diff_file</span><span class="p">:</span> <span class="n" style="color: #333;"><span class="idiff left">diff_file</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="nb" style="color: #0086b3;"><span class="idiff">open</span></span><span class="p"><span class="idiff right">(</span></span><span class="s" style="color: #d14;">'ab'</span><span class="p">)</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">close</span><span class="p">()</span> <span class="c1" style="color: #998; font-style: italic;"># Make sure the file exists still as</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="1787" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1786" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1786
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1786" class="line" lang="python"> <span class="idiff left right"> </span><span class="c1" style="color: #998; font-style: italic;"># we will try to read it later</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1787" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1787
</td>
<td class="diff-line-num new_line" data-linenumber="1787" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1787
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1787" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1788" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1788
</td>
<td class="diff-line-num new_line" data-linenumber="1788" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1788
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1788" class="line" lang="python"> <span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">config</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">accept</span> <span class="ow" style="font-weight: 600;">and</span> <span class="p">(</span><span class="n" style="color: #333;">getTestOpts</span><span class="p">()</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">expect</span> <span class="o" style="font-weight: 600;">==</span> <span class="s" style="color: #d14;">'fail'</span> <span class="ow" style="font-weight: 600;">or</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1789" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1789
</td>
<td class="diff-line-num new_line" data-linenumber="1789" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1789
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1789" class="line" lang="python"> <span class="n" style="color: #333;">way</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">getTestOpts</span><span class="p">()</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">expect_fail_for</span><span class="p">):</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/commit/b3d40b1818911a568ed25df4256cf2169b9e126e">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.haskell.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.haskell.org/ghc/ghc/commit/b3d40b1818911a568ed25df4256cf2169b9e126e"}}</script>
</p>
</div>
</body>
</html>