Skia Gold: Fix Android stdout parsing.

A recent change in Chromium broke how we were parsing stdout for capturing system info on Android. Fix the break and also update some helper scripts to work better when run manually. Bug: angleproject:5261 Change-Id: Iecc00bbe540461ab50ea31b5245b8b38a7250956 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2507633Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Skia Gold: Fix Android stdout parsing.
cb1a3ce5 · Jamie Madill · Commit Bot · 68b95b63 · cb1a3ce5 · cb1a3ce5
Commit cb1a3ce5 authored Oct 29, 2020 by Jamie Madill Committed by Commit Bot Oct 29, 2020
5 changed files
--- a/src/tests/restricted_traces/restricted_trace_gold_tests.py
+++ b/src/tests/restricted_traces/restricted_trace_gold_tests.py
@@ -182,7 +182,7 @@ def get_skia_gold_keys(args):
        def append(self, line):
            if self.done_accepting_lines:
                return
-            if 'android/test_runner.py' in line:
+            if 'Additional test environment' in line or 'android/test_runner.py' in line:
                self.accepting_lines = False
                self.is_android = True
            if ANDROID_BEGIN_SYSTEM_INFO in line:

--- a/src/tests/restricted_traces/skia_gold/__init__.py
+++ b/src/tests/restricted_traces/skia_gold/__init__.py
--- a/src/tests/restricted_traces/skia_gold/angle_skia_gold_properties.py
+++ b/src/tests/restricted_traces/skia_gold/angle_skia_gold_properties.py
@@ -3,7 +3,18 @@
 # found in the LICENSE file.
 """ANGLE implementation of //build/skia_gold_common/skia_gold_properties.py."""

+import os
+import sys
 import subprocess
+import sys
+
+d = os.path.dirname
+THIS_DIR = d(os.path.abspath(__file__))
+ANGLE_SRC_DIR = d(d(d(d(THIS_DIR))))
+sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'build'))
+CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
+sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
+
 from skia_gold_common import skia_gold_properties



--- a/src/tests/restricted_traces/skia_gold/angle_skia_gold_session.py
+++ b/src/tests/restricted_traces/skia_gold/angle_skia_gold_session.py
@@ -3,6 +3,16 @@
 # found in the LICENSE file.
 """ANGLE implementation of //build/skia_gold_common/skia_gold_session.py."""

+import os
+import sys
+
+d = os.path.dirname
+THIS_DIR = d(os.path.abspath(__file__))
+ANGLE_SRC_DIR = d(d(d(d(THIS_DIR))))
+sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'build'))
+CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
+sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
+
 from skia_gold_common import output_managerless_skia_gold_session as omsgs



--- a/src/tests/restricted_traces/skia_gold/angle_skia_gold_session_manager.py
+++ b/src/tests/restricted_traces/skia_gold/angle_skia_gold_session_manager.py
@@ -3,6 +3,16 @@
 # found in the LICENSE file.
 """ANGLE implementation of //build/skia_gold_common/skia_gold_session_manager.py."""

+import os
+import sys
+
+d = os.path.dirname
+THIS_DIR = d(os.path.abspath(__file__))
+ANGLE_SRC_DIR = d(d(d(d(THIS_DIR))))
+sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'build'))
+CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
+sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
+
 from skia_gold_common import skia_gold_session_manager as sgsm
 import angle_skia_gold_session