<!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/205fe4ce758dfafc3882759a5216e24d58398754">205fe4ce</a></strong>
<div>
<span>by Ben Gamari</span>
<i>at 2019-06-23T03:08:52Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Fix it
</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/205fe4ce758dfafc3882759a5216e24d58398754#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="855" 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="855" 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">@@ -855,7 +855,7 @@ def test_common_work(watcher: testutil.Watcher,</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="855" 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">
855
</td>
<td class="diff-line-num new_line" data-linenumber="855" 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">
855
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC855" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># specify all other files that their test depends on (but</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="856" 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">
856
</td>
<td class="diff-line-num new_line" data-linenumber="856" 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">
856
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC856" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># this seems to be necessary for only about 10% of all</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="857" 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">
857
</td>
<td class="diff-line-num new_line" data-linenumber="857" 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">
857
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC857" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># tests).</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="858" 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">
858
</td>
<td class="diff-line-num new_line old" data-linenumber="858" 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="LC858" class="line" lang="python"> <span class="n" style="color: #333;">files</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">set</span><span class="p">(</span><span class="n" style="color: #333;">f</span> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">f</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">os</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">listdir</span><span class="p">(</span><span class="n" style="color: #333;"><span class="idiff left">opts</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff right">srcdir</span></span><span class="p">)</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="859" 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="858" 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">
858
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC858" class="line" lang="python"> <span class="n" style="color: #333;">files</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">set</span><span class="p">(</span><span class="n" style="color: #333;">f</span> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">f</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">os</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">listdir</span><span class="p">(</span><span class="nb" style="color: #0086b3;"><span class="idiff left">str</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">opts</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">srcdir</span></span><span class="p"><span class="idiff right">)</span>)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="859" 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">
859
</td>
<td class="diff-line-num new_line" data-linenumber="859" 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">
859
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC859" class="line" lang="python"> <span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">f</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">startswith</span><span class="p">(</span><span class="n" style="color: #333;">name</span><span class="p">)</span> <span class="ow" style="font-weight: 600;">and</span> <span class="ow" style="font-weight: 600;">not</span> <span class="n" style="color: #333;">f</span> <span class="o" style="font-weight: 600;">==</span> <span class="n" style="color: #333;">name</span> <span class="ow" style="font-weight: 600;">and</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="860" 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">
860
</td>
<td class="diff-line-num new_line" data-linenumber="860" 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">
860
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC860" class="line" lang="python"> <span class="ow" style="font-weight: 600;">not</span> <span class="n" style="color: #333;">f</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">endswith</span><span class="p">(</span><span class="n" style="color: #333;">testdir_suffix</span><span class="p">)</span> <span class="ow" style="font-weight: 600;">and</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="861" 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">
861
</td>
<td class="diff-line-num new_line" data-linenumber="861" 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">
861
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC861" class="line" lang="python"> <span class="ow" style="font-weight: 600;">not</span> <span class="n" style="color: #333;">os</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">path</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">splitext</span><span class="p">(</span><span class="n" style="color: #333;">f</span><span class="p">)[</span><span class="mi" style="color: #099;">1</span><span class="p">]</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">do_not_copy</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="867" 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="867" 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">@@ -867,8 +867,8 @@ def test_common_work(watcher: testutil.Watcher,</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="867" 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">
867
</td>
<td class="diff-line-num new_line" data-linenumber="867" 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">
867
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC867" class="line" lang="python"> <span class="k" style="font-weight: 600;">elif</span> <span class="s" style="color: #d14;">'*'</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">filename</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="868" 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">
868
</td>
<td class="diff-line-num new_line" data-linenumber="868" 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">
868
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC868" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># Don't use wildcards in extra_files too much, as</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="869" 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">
869
</td>
<td class="diff-line-num new_line" data-linenumber="869" 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">
869
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC869" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># globbing is slow.</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="870" 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">
870
</td>
<td class="diff-line-num new_line old" data-linenumber="870" 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="LC870" class="line" lang="python"> <span class="n" style="color: #333;">files</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">update</span><span class="p">(<span class="idiff left">(</span></span><span class="n" style="color: #333;"><span class="idiff">os</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">path</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">relpath</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">f</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff right"> </span><span class="n" style="color: #333;">opts</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">srcdir</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="871" 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">
871
</td>
<td class="diff-line-num new_line old" data-linenumber="870" 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="LC871" class="line" lang="python"> <span class="k" style="font-weight: 600;"><span class="idiff left">for</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">f</span></span><span class="idiff"> </span><span class="ow" style="font-weight: 600;"><span class="idiff">in</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">glob</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">iglob</span></span><span class="p"><span class="idiff">(</span></span><span class="nb" style="color: #0086b3;"><span class="idiff">str</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">in_srcdir</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">filename</span></span><span class="p"><span class="idiff right">)</span>))))</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="872" 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="870" 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">
870
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC870" class="line" lang="python"> <span class="n" style="color: #333;">files</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">update</span><span class="p">(</span><span class="n" style="color: #333;"><span class="idiff left">f</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">relative_to</span></span><span class="p"><span class="idiff right">(</span></span><span class="n" style="color: #333;">opts</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">srcdir</span><span class="p">)</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="872" 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="871" 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">
871
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC871" class="line" lang="python"> <span class="idiff left"> </span><span class="k" style="font-weight: 600;"><span class="idiff">for</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">f</span></span><span class="idiff"> </span><span class="ow" style="font-weight: 600;"><span class="idiff">in</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">glob</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">iglob</span></span><span class="p"><span class="idiff">(</span></span><span class="nb" style="color: #0086b3;"><span class="idiff">str</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">in_srcdir</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff right">filename</span></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="872" 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">
872
</td>
<td class="diff-line-num new_line" data-linenumber="872" 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">
872
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC872" 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="873" 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">
873
</td>
<td class="diff-line-num new_line" data-linenumber="873" 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">
873
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC873" class="line" lang="python"> <span class="k" style="font-weight: 600;">elif</span> <span class="n" style="color: #333;">filename</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="874" 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">
874
</td>
<td class="diff-line-num new_line" data-linenumber="874" 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">
874
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC874" class="line" lang="python"> <span class="n" style="color: #333;">files</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">add</span><span class="p">(</span><span class="n" style="color: #333;">filename</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1028" 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="1028" 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">@@ -1028,7 +1028,7 @@ def override_options(pre_cmd):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1028" 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">
1028
</td>
<td class="diff-line-num new_line" data-linenumber="1028" 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">
1028
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1028" 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="1029" 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">
1029
</td>
<td class="diff-line-num new_line" data-linenumber="1029" 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">
1029
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1029" class="line" lang="python"><span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">framework_fail</span><span class="p">(</span><span class="n" style="color: #333;">name</span><span class="p">:</span> <span class="n" style="color: #333;">Optional</span><span class="p">[</span><span class="n" style="color: #333;">TestName</span><span class="p">],</span> <span class="n" style="color: #333;">way</span><span class="p">:</span> <span class="n" style="color: #333;">Optional</span><span class="p">[</span><span class="n" style="color: #333;">WayName</span><span class="p">],</span> <span class="n" style="color: #333;">reason</span><span class="p">:</span> <span class="nb" style="color: #0086b3;">str</span><span class="p">)</span> <span class="o" style="font-weight: 600;">-></span> <span class="bp" style="color: #999;">None</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="1030" 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">
1030
</td>
<td class="diff-line-num new_line" data-linenumber="1030" 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">
1030
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1030" class="line" lang="python"> <span class="n" style="color: #333;">opts</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">getTestOpts</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="1031" 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">
1031
</td>
<td class="diff-line-num new_line old" data-linenumber="1031" 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="LC1031" class="line" lang="python"> <span class="n" style="color: #333;">directory</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">re</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">sub</span><span class="p">(</span><span class="s" style="color: #d14;">'^</span><span class="se" style="color: #d14;">\\</span><span class="s" style="color: #d14;">.[/</span><span class="se" style="color: #d14;">\\\\</span><span class="s" style="color: #d14;">]'</span><span class="p">,</span> <span class="s" style="color: #d14;">''</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left">opts</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff right">testdir</span></span><span class="p">)</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="1032" 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="1031" 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">
1031
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1031" class="line" lang="python"> <span class="n" style="color: #333;">directory</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">re</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">sub</span><span class="p">(</span><span class="s" style="color: #d14;">'^</span><span class="se" style="color: #d14;">\\</span><span class="s" style="color: #d14;">.[/</span><span class="se" style="color: #d14;">\\\\</span><span class="s" style="color: #d14;">]'</span><span class="p">,</span> <span class="s" style="color: #d14;">''</span><span class="p">,</span> <span class="nb" style="color: #0086b3;"><span class="idiff left">str</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">opts</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">testdir</span></span><span class="p"><span class="idiff right">)</span>)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1032" 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">
1032
</td>
<td class="diff-line-num new_line" data-linenumber="1032" 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">
1032
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1032" class="line" lang="python"> <span class="n" style="color: #333;">full_name</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">'</span><span class="si" style="color: #d14;">%</span><span class="s" style="color: #d14;">s(</span><span class="si" style="color: #d14;">%</span><span class="s" style="color: #d14;">s)'</span> <span class="o" style="font-weight: 600;">%</span> <span class="p">(</span><span class="n" style="color: #333;">name</span><span class="p">,</span> <span class="n" style="color: #333;">way</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="1033" 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">
1033
</td>
<td class="diff-line-num new_line" data-linenumber="1033" 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">
1033
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1033" class="line" lang="python"> <span class="n" style="color: #333;">if_verbose</span><span class="p">(</span><span class="mi" style="color: #099;">1</span><span class="p">,</span> <span class="s" style="color: #d14;">'*** framework failure for </span><span class="si" style="color: #d14;">%</span><span class="s" style="color: #d14;">s </span><span class="si" style="color: #d14;">%</span><span class="s" style="color: #d14;">s '</span> <span class="o" style="font-weight: 600;">%</span> <span class="p">(</span><span class="n" style="color: #333;">full_name</span><span class="p">,</span> <span class="n" style="color: #333;">reason</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="1034" 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">
1034
</td>
<td class="diff-line-num new_line" data-linenumber="1034" 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">
1034
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1034" class="line" lang="python"> <span class="n" style="color: #333;">name2</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">name</span> <span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">name</span> <span class="ow" style="font-weight: 600;">is</span> <span class="ow" style="font-weight: 600;">not</span> <span class="bp" style="color: #999;">None</span> <span class="k" style="font-weight: 600;">else</span> <span class="n" style="color: #333;">TestName</span><span class="p">(</span><span class="s" style="color: #d14;">'none'</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/205fe4ce758dfafc3882759a5216e24d58398754">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/205fe4ce758dfafc3882759a5216e24d58398754"}}</script>
</p>
</div>
</body>
</html>