Make glmark2 benchmark output parsing more resilient

On Linux, the following info messages are being output which are seemingly harmless: INFO: EGL CRITICAL: eglQueryString: display is not initialized. INFO: EGL ERROR: eglGetPlatformDisplayEXT: Bad platform type. These lines are now parsed and forwarded to output. Bug: angleproject:3139 Change-Id: Ia9feb2aef4c1809283588d6e5fc1b6a51ae8812b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2648641Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Make glmark2 benchmark output parsing more resilient
c38413f8 · Shahbaz Youssefi · Commit Bot · f9afaaee · c38413f8
Commit c38413f8 authored Jan 26, 2021 by Shahbaz Youssefi Committed by Commit Bot Jan 27, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

glmark2Benchmark.cpp src/tests/perf_tests/glmark2Benchmark.cpp +7 -1

No files found.
--- a/src/tests/perf_tests/glmark2Benchmark.cpp
+++ b/src/tests/perf_tests/glmark2Benchmark.cpp
@@ -15,6 +15,7 @@
 #include "../perf_tests/third_party/perf/perf_result_reporter.h"
 #include "ANGLEPerfTestArgs.h"
 #include "common/platform.h"
+#include "common/string_utils.h"
 #include "common/system_utils.h"
 #include "test_utils/angle_test_configs.h"
 #include "test_utils/angle_test_instantiate.h"
@@ -193,8 +194,13 @@ class GLMark2Benchmark : public testing::TestWithParam<GLMark2TestParams>
        std::istringstream glmark2Output(output);
        std::string line;

+        // Forward any INFO: lines that may have been generated.
+        while (std::getline(glmark2Output, line) && BeginsWith(line, "INFO:"))
+        {
+            fprintf(stderr, "%s\n", line.c_str());
+        }
+
        // Expect ==== at the top of the header
-        std::getline(glmark2Output, line);
        ASSERT_EQ('=', line[0]);

        // Skip one line