Skip to content

Commit

Permalink
Fix opt-viewer tests failing after move from cgi.escape to html.escape
Browse files Browse the repository at this point in the history
These two tests utilize pre-generated opt-viewer output to diff against
a run of opt-viewer over a known yaml file.

In commit 4b428e8 (D76126), the escape function used for rendering was changed
from cgi.escape to html.escape. This modification causes a behavioral
difference with regards to quote characters.

cgi will not escape quotes by default, but html will.

Therefore, these tests were failing because they expected the old behavior
of "string", but was instead seeing "string&quot.

This solution modifies the known test outputs to use the escaped quotes
rather than not escaping quotes during rendering for no particular reason.

It is notable that when testing the optimization records generated by
LLVM, there was never quotes in the remarks I could find, specifically in
the Callee field where they exist in the pre-generated yaml for testing.

Differential Revision: https://reviews.llvm.org/D78241
  • Loading branch information
DragonDisciple authored and serge-sans-paille committed Apr 17, 2020
1 parent c5fa0a4 commit e144474
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion llvm/test/tools/opt-viewer/Outputs/suppress/s.swift.html
Expand Up @@ -124,7 +124,7 @@
<td></td>
<td></td>
<td class="column-entry-green">sil-inliner</td>
<td><pre style="display:inline"></pre><span class="column-entry-yellow"> <a href="s.swift.html#L6">"s.f()"</a> inlined into "main" (cost = 20, benefit = 20)&nbsp;</span></td>
<td><pre style="display:inline"></pre><span class="column-entry-yellow"> <a href="s.swift.html#L6">&quot;s.f()&quot;</a> inlined into &quot;main&quot; (cost = 20, benefit = 20)&nbsp;</span></td>
<td class="column-entry-yellow">main</td>
</tr>

Expand Down
Expand Up @@ -124,7 +124,7 @@
<td></td>
<td></td>
<td class="column-entry-green">sil-inliner</td>
<td><pre style="display:inline"> </pre><span class="column-entry-yellow"> <a href="s.swift.html#L3">"s.• infix(_:_:)"</a> inlined into "main" (cost = 2, benefit = 40)&nbsp;</span></td>
<td><pre style="display:inline"> </pre><span class="column-entry-yellow"> <a href="s.swift.html#L3">&quot;s.• infix(_:_:)&quot;</a> inlined into &quot;main&quot; (cost = 2, benefit = 40)&nbsp;</span></td>
<td class="column-entry-yellow">main</td>
</tr>

Expand Down

0 comments on commit e144474

Please sign in to comment.