[analyzer] SATest: Weaken assumption about HTML files

[mantognini]

Summary

Instead of assuming there is an HTML file for each diagnostics, consider
the HTML files only when they exist, individually of each other.

After generating the reference data, running

python /scripts/SATest.py build --projects simbody

was resulting in this error:

  File "/scripts/CmpRuns.py", line 250, in read_single_file
    assert len(d['HTMLDiagnostics_files']) == 1
KeyError: 'HTMLDiagnostics_files'

[mantognini]

This patch relates to my previous comment: https://reviews.llvm.org/D124621#3485799

[steakhal]

I'm not using this script file, so I'm not gonna be too picky about this.
However, I would be more confident landing changes if we had tests exercising the changed behavior.
If you plan to land more changes to this file, consider adding some tests.

[mantognini]

In D126197#3533674, @steakhal wrote:

I'm not using this script file, so I'm not gonna be too picky about this.
However, I would be more confident landing changes if we had tests exercising the changed behavior.
If you plan to land more changes to this file, consider adding some tests.

I agree tests would be good, but I'm not sure where to start. To clarify, that is also the only change I've got to this file and I don't plan further change in the near future.

clang/utils/analyzer/CmpRuns.py

def read_single_file(self, path: str, delete_empty: bool):
 
         # Ignore/delete empty reports.
         if not data['files']:
             if delete_empty:
                 os.remove(path)
             return
 
         # Extract the HTML reports, if they exists.
-        if 'HTMLDiagnostics_files' in data['diagnostics'][0]:
-            htmlFiles = []
-            for d in data['diagnostics']:
+            if 'HTMLDiagnostics_files' in d:
                 # FIXME: Why is this named files, when does it have multiple
                 # files?
                 assert len(d['HTMLDiagnostics_files']) == 1
                 htmlFiles.append(d.pop('HTMLDiagnostics_files')[0])
             else:
-            htmlFiles = [None] * len(data['diagnostics'])
+                htmlFiles.append(None)
 
         report = AnalysisReport(self, data.pop('files'))
+        # Python 3.10 offers zip(..., strict=True). The following assertion
+        # mimics it.
+        assert len(data['diagnostics']) == len(htmlFiles)
         diagnostics = [AnalysisDiagnostic(d, report, h)
                        for d, h in zip(data.pop('diagnostics'), htmlFiles)]
 
         assert not data
 
         report.diagnostics.extend(diagnostics)
         self.reports.append(report)
         self.diagnostics.extend(diagnostics)