[llvm] e144474 - Fix opt-viewer tests failing after move from cgi.escape to html.escape

[via llvm-commits]

Author: James Nagurne
Date: 2020-04-17T08:37:47+02:00
New Revision: e144474448b1e1b980ae219659824c61b1decdd7

URL: https://github.com/llvm/llvm-project/commit/e144474448b1e1b980ae219659824c61b1decdd7
DIFF: https://github.com/llvm/llvm-project/commit/e144474448b1e1b980ae219659824c61b1decdd7.diff

LOG: Fix opt-viewer tests failing after move from cgi.escape to html.escape

These two tests utilize pre-generated opt-viewer output to diff against
a run of opt-viewer over a known yaml file.

In commit 4b428e8f (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

Added: 
    

Modified: 
    llvm/test/tools/opt-viewer/Outputs/suppress/s.swift.html
    llvm/test/tools/opt-viewer/Outputs/unicode-function-name/s.swift.html

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/opt-viewer/Outputs/suppress/s.swift.html b/llvm/test/tools/opt-viewer/Outputs/suppress/s.swift.html
index f67352079ed6..7bb111db2b46 100644
--- a/llvm/test/tools/opt-viewer/Outputs/suppress/s.swift.html
+++ b/llvm/test/tools/opt-viewer/Outputs/suppress/s.swift.html
@@ -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) </span></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) </span></td>
 <td class="column-entry-yellow">main</td>
 </tr>
 

diff  --git a/llvm/test/tools/opt-viewer/Outputs/unicode-function-name/s.swift.html b/llvm/test/tools/opt-viewer/Outputs/unicode-function-name/s.swift.html
index 744c5b7579e8..995ea72f4ddb 100644
--- a/llvm/test/tools/opt-viewer/Outputs/unicode-function-name/s.swift.html
+++ b/llvm/test/tools/opt-viewer/Outputs/unicode-function-name/s.swift.html
@@ -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) </span></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) </span></td>
 <td class="column-entry-yellow">main</td>
 </tr>