Refactoring: change how tool-information is passed to HTML tables

So far we prerender most of the entries in the table with the benchmark
setup. Now we change that for the row "Tool" because we want to extend
it with richer data.

No actually visible change so far.

benchexec/tablegenerator/htmltable.py

@@ -135,16 +135,27 @@ def _prepare_benchmark_setup_data(
     # It is used for calculating the column spans of the header cells.
     runSetWidths = [len(runSetResult.columns) for runSetResult in runSetResults]
 
-    def get_row(rowName, format_string, collapse=False, onlyIf=None, default="Unknown"):
-        def format_cell(attributes):
-            if onlyIf and onlyIf not in attributes:
-                formatStr = default
-            else:
-                formatStr = format_string
-            return formatStr.format_map(collections.defaultdict(str, attributes))
-
+    def format_string_cell(attributes, format_string, onlyIf=None, default="Unknown"):
+        if onlyIf and onlyIf not in attributes:
+            formatStr = default
+        else:
+            formatStr = format_string
+        return formatStr.format_map(collections.defaultdict(str, attributes))
+
+    def tool_data_cell(attributes):
+        keys = ["tool", "version"]
+        return {k: str(attributes[k]) for k in keys if attributes.get(k)}
+
+    def get_row(
+        rowName,
+        *format_args,
+        cell_format=format_string_cell,
+        collapse=False,
+        **format_kwargs,
+    ):
         values = [
-            format_cell(runSetResult.attributes) for runSetResult in runSetResults
+            cell_format(runSetResult.attributes, *format_args, **format_kwargs)
+            for runSetResult in runSetResults
         ]
         if not any(values):
             return None  # skip row without values completely
@@ -183,7 +194,7 @@ def format_cell(attributes):
             )
 
     return {
-        "tool": get_row("Tool", "{tool} {version}", collapse=True),
+        "tool": get_row("Tool", cell_format=tool_data_cell, collapse=True),
         "displayName": get_row("Benchmark", "{displayName}", collapse=True),
         "limit": get_row(
             "Limits",

benchexec/tablegenerator/react-table/src/components/Summary.js

@@ -33,17 +33,32 @@ const Summary = (props) => {
     ));
   };
 
+  const renderToolNameAndVersion = ({ tool, version }) => {
+    return (
+      <>
+        {tool} {version}
+      </>
+    );
+  };
+
   /* ++++++++++++++ Table render functions ++++++++++++++ */
 
-  const renderEnvironmentRow = (row, text, colSpan, j) => {
+  const renderRow = (row, text, colSpan, j) => {
     const isOptionRow = row === "options";
+    const isToolRow = row === "tool";
     return (
       <td
         colSpan={colSpan}
         key={text + j}
         className={`header__tool-row${isOptionRow && " options"}`}
       >
-        {isOptionRow ? <ul>{renderOptions(text)}</ul> : text}
+        {isOptionRow ? (
+          <ul>{renderOptions(text)}</ul>
+        ) : isToolRow ? (
+          renderToolNameAndVersion(text)
+        ) : (
+          text
+        )}
       </td>
     );
   };
@@ -57,11 +72,11 @@ const Summary = (props) => {
             {infos
               .map((row) => props.tableHeader[row])
               .filter((row) => row !== null)
-              .map((row, i) => (
+              .map((row) => (
                 <tr key={"tr-" + row.id} className={row.id}>
                   <th key={"td-" + row.id}>{row.name}</th>
                   {row.content.map((tool, j) =>
-                    renderEnvironmentRow(row.id, tool[0], tool[1], j),
+                    renderRow(row.id, tool[0], tool[1], j),
                   )}
                 </tr>
               ))}

benchexec/tablegenerator/react-table/src/data/data.json

@@ -66,7 +66,7 @@
       "name": "benchexec/tablegenerator/test_integration/results/"
     },
     "tool": {
-      "content": [["CPAchecker 1.4-svn 15944M", 6]],
+      "content": [[{"tool": "CPAchecker", "version": "1.4-svn 15944M"}, 6]],
       "id": "tool",
       "name": "Tool"
     }