[CI] (P13): the skip census keys parameterised cases without their printed GetParam bytes

This commit is contained in:
2026-10-06 05:28:55 -04:00
parent 7643822606
commit 6cb6fa88f1
2 changed files with 133 additions and 5920 deletions
+16 -1
View File
@@ -29,11 +29,22 @@ them out like that); every *.xml under a lane directory counts toward that lane,
import argparse import argparse
import json import json
import pathlib import pathlib
import re
import sys import sys
import tempfile import tempfile
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
# gtest_discover_tests names a value-parameterised case `<name> # GetParam() = <printed value>`,
# and a printed struct of pointers is raw bytes that move with every build. The census keys a
# case by what it IS, not by where its parameter happened to land.
_PARAM_SUFFIX = re.compile(r'\s+#\s+(?:GetParam|TypeParam)\(\) = .*$', re.S)
def normalize_name(name):
return _PARAM_SUFFIX.sub('', name)
def case_status(case): def case_status(case):
if case.find('failure') is not None or case.find('error') is not None: if case.find('failure') is not None or case.find('error') is not None:
return 'fail' return 'fail'
@@ -58,6 +69,7 @@ def collect(root):
name = case.get('name') name = case.get('name')
if not name: if not name:
continue continue
name = normalize_name(name)
status = case_status(case) status = case_status(case)
# A name reported twice in one lane (a rerun) keeps its worst outcome. # A name reported twice in one lane (a rerun) keeps its worst outcome.
order = {'pass': 0, 'skip': 1, 'fail': 2} order = {'pass': 0, 'skip': 1, 'fail': 2}
@@ -88,7 +100,8 @@ def resolve_baseline(baseline):
resolved = {} resolved = {}
for lane, row in baseline.items(): for lane, row in baseline.items():
names = row['names'] if 'names' in row else baseline[row['names_from']]['names'] names = row['names'] if 'names' in row else baseline[row['names_from']]['names']
resolved[lane] = {'names': names, 'skipped': row['skipped']} resolved[lane] = {'names': sorted({normalize_name(n) for n in names}),
'skipped': sorted({normalize_name(n) for n in row['skipped']})}
return resolved return resolved
@@ -195,6 +208,8 @@ def self_test():
assert quiet(['check', str(lost), '--baseline', str(base)]) == 1, 'a lane that vanished must be red' assert quiet(['check', str(lost), '--baseline', str(base)]) == 1, 'a lane that vanished must be red'
assert quiet(['check', str(tmp / 'empty'), '--baseline', str(base)]) == 1, 'no JUnit must be red' assert quiet(['check', str(tmp / 'empty'), '--baseline', str(base)]) == 1, 'no JUnit must be red'
assert quiet(['check', str(good), '--baseline', str(tmp / 'none.json')]) == 1, 'no baseline must be red' assert quiet(['check', str(good), '--baseline', str(tmp / 'none.json')]) == 1, 'no baseline must be red'
assert normalize_name('S/T.Case/Leaf # GetParam() = 64-byte object <46-CA 08-EB>') == 'S/T.Case/Leaf'
assert normalize_name('T.Plain') == 'T.Plain'
twins = {'a/x': {'p': 'pass', 'q': 'skip'}, 'b/x': {'p': 'pass', 'q': 'pass'}} twins = {'a/x': {'p': 'pass', 'q': 'skip'}, 'b/x': {'p': 'pass', 'q': 'pass'}}
packed = to_baseline(twins) packed = to_baseline(twins)
assert 'names_from' in packed['b/x'] and resolve_baseline(packed)['b/x']['names'] == ['p', 'q'] assert 'names_from' in packed['b/x'] and resolve_baseline(packed)['b/x']['names'] == ['p', 'q']
File diff suppressed because it is too large Load Diff