diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-18 18:22:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-18 18:22:05 +0200 |
| commit | 9c1c8b2dff12652c74030097862d211aea5cf34a (patch) | |
| tree | b36d50b18551ae67789f11c5f814c28b8a4a7ee4 /src | |
| parent | a6ad1394f3f7fe1d9d459964a2d4be8d6ba2ea5a (diff) | |
| parent | 06ec80a68fb5e9ba12423461952a462fb0ae0151 (diff) | |
| download | rust-9c1c8b2dff12652c74030097862d211aea5cf34a.tar.gz rust-9c1c8b2dff12652c74030097862d211aea5cf34a.zip | |
Rollup merge of #96143 - Urgau:rustdoc-fix-snapshot-bless, r=GuillaumeGomez
Fix snapshot --bless not working anymore in htmldocck I broke it in https://github.com/rust-lang/rust/pull/95933 r? ```@GuillaumeGomez```
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/htmldocck.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/etc/htmldocck.py b/src/etc/htmldocck.py index df215f31823..269b6868e29 100644 --- a/src/etc/htmldocck.py +++ b/src/etc/htmldocck.py @@ -423,8 +423,12 @@ def check_snapshot(snapshot_name, actual_tree, normalize_to_text): else: actual_str = flatten(actual_tree) + # Conditions: + # 1. Is --bless + # 2. Are actual and expected tree different + # 3. Are actual and expected text different if not expected_str \ - or (not normalize_to_text and + or (not normalize_to_text and \ not compare_tree(make_xml(actual_str), make_xml(expected_str), stderr)) \ or (normalize_to_text and actual_str != expected_str): |