From c492bf1958875af2f991ebd575300165accbd008 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Fri, 5 Jan 2018 15:06:59 +0100 Subject: [PATCH] Fix JSON format for reporting perf results. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is list_of_scalar_values, not list_of_scalars. https://github.com/catapult-project/catapult/blob/master/dashboard/docs/data-format.md R=phoglund@webrtc.org Bug: webrtc:7156 Change-Id: I391d507d3e0fd9bf0e8a12a5aa6824278ccfb39c Reviewed-on: https://webrtc-review.googlesource.com/37642 Reviewed-by: Patrik Höglund Commit-Queue: Edward Lemur Cr-Commit-Position: refs/heads/master@{#21515} --- test/testsupport/perf_test.cc | 4 ++-- test/testsupport/perf_test_unittest.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc index c2a2a502f9..060cf3720a 100644 --- a/test/testsupport/perf_test.cc +++ b/test/testsupport/perf_test.cc @@ -82,7 +82,7 @@ class PerfResultsLogger { std::ostringstream json_stream; json_stream << '"' << trace_name << R"(":{)"; - json_stream << R"("type":"list_of_scalars",)"; + json_stream << R"("type":"list_of_scalar_values",)"; json_stream << R"("values":[)" << mean << "],"; json_stream << R"("std":)" << error << ','; json_stream << R"("units":")" << units << R"("})"; @@ -104,7 +104,7 @@ class PerfResultsLogger { std::ostringstream json_stream; json_stream << '"' << trace_name << R"(":{)"; - json_stream << R"("type":"list_of_scalars",)"; + json_stream << R"("type":"list_of_scalar_values",)"; json_stream << R"("values":)" << value_stream.str() << ','; json_stream << R"("units":")" << units << R"("})"; rtc::CritScope lock(&crit_); diff --git a/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc index 514196b1e9..bd8e85f4f3 100644 --- a/test/testsupport/perf_test_unittest.cc +++ b/test/testsupport/perf_test_unittest.cc @@ -26,13 +26,13 @@ const char* kJsonExpected = R"({ "units":"widgets" }, "baz_me":{ - "type":"list_of_scalars", + "type":"list_of_scalar_values", "values":[1], "std":2, "units":"lemurs" }, "baz_vl":{ - "type":"list_of_scalars", + "type":"list_of_scalar_values", "values":[1,2,3], "units":"units" }