{
));
};
+ 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 (
- {isOptionRow ? : text}
+ {isOptionRow ? (
+
+ ) : isToolRow ? (
+ renderToolNameAndVersion(text)
+ ) : (
+ text
+ )}
|
);
};
@@ -57,11 +72,11 @@ const Summary = (props) => {
{infos
.map((row) => props.tableHeader[row])
.filter((row) => row !== null)
- .map((row, i) => (
+ .map((row) => (
{row.name} |
{row.content.map((tool, j) =>
- renderEnvironmentRow(row.id, tool[0], tool[1], j),
+ renderRow(row.id, tool[0], tool[1], j),
)}
))}
diff --git a/benchexec/tablegenerator/react-table/src/data/data.json b/benchexec/tablegenerator/react-table/src/data/data.json
index ce390b4e7..98ba06982 100644
--- a/benchexec/tablegenerator/react-table/src/data/data.json
+++ b/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"
}
diff --git a/benchexec/tablegenerator/react-table/src/tests/__snapshots__/Summary.test.js.snap b/benchexec/tablegenerator/react-table/src/tests/__snapshots__/Summary.test.js.snap
index 99e6b945c..65f6e6b0c 100644
--- a/benchexec/tablegenerator/react-table/src/tests/__snapshots__/Summary.test.js.snap
+++ b/benchexec/tablegenerator/react-table/src/tests/__snapshots__/Summary.test.js.snap
@@ -22,7 +22,7 @@ exports[`Render Summary for benchmark-example-true.2019-11-06_0932.results.no op
className="header__tool-rowfalse"
colSpan={5}
>
- DummyTool
+ DummyTool
- CPAchecker trunk:18107
+ CPAcheckertrunk:18107
- CPAchecker 1.4-svn 24ecead+
+ CPAchecker1.4-svn 24ecead+
|
- CPAchecker 1.4-svn 18152M
+ CPAchecker1.4-svn 18152M
|
- CBMC
+ CBMC
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
|
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
|
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.7-svn 28500M
+ CPAchecker1.7-svn 28500M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
|
- DummyTool
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- MathSAT 5.3.5
+ MathSAT5.3.5
- SMTInterpol 2.1-183-g4d3bb9f
+ SMTInterpol2.1-183-g4d3bb9f
|
- MathSAT 5.3.5
+ MathSAT5.3.5
- SMTInterpol 2.1-183-g4d3bb9f
+ SMTInterpol2.1-183-g4d3bb9f
|
- DummyTool
+ DummyTool
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker [1.4-svn 15944M; 1.4-svn 15986M]
+ CPAchecker[1.4-svn 15944M; 1.4-svn 15986M]
- CPAchecker [1.4-svn 15944M; 1.4-svn 15986M]
+ CPAchecker[1.4-svn 15944M; 1.4-svn 15986M]
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15986M
+ CPAchecker1.4-svn 15986M
|
- CPAchecker [1.4-svn 15944M; 1.4-svn 15986M]
+ CPAchecker[1.4-svn 15944M; 1.4-svn 15986M]
- CPAchecker [1.4-svn 15944M; 1.4-svn 15986M]
+ CPAchecker[1.4-svn 15944M; 1.4-svn 15986M]
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
- CPAchecker 1.4-svn 15944M
+ CPAchecker1.4-svn 15944M
|