Support SKIPPED tests in ParseGTestOutput

Bug: chromium:912138
Change-Id: Ifee9197731789b3a113ebefe188f95447c126187
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526946Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825883}

build/android/pylib/gtest/gtest_test_instance.py

@@ -85,7 +85,7 @@ _EXTRA_SHARD_SIZE_LIMIT = (
 # results.
 _RE_TEST_STATUS = re.compile(
     # Test state.
-    r'\[ +((?:RUN)|(?:FAILED)|(?:OK)|(?:CRASHED)) +\] ?'
+    r'\[ +((?:RUN)|(?:FAILED)|(?:OK)|(?:CRASHED)|(?:SKIPPED)) +\] ?'
     # Test name.
     r'([^ ]+)?'
     # Optional parameters.
@@ -191,6 +191,8 @@ def ParseGTestOutput(output, symbolizer, device_abi):
         result_type = None
       elif matcher.group(1) == 'OK':
         result_type = base_test_result.ResultType.PASS
+      elif matcher.group(1) == 'SKIPPED':
+        result_type = base_test_result.ResultType.SKIP
       elif matcher.group(1) == 'FAILED':
         result_type = base_test_result.ResultType.FAIL
       elif matcher.group(1) == 'CRASHED':

build/android/pylib/gtest/gtest_test_instance_test.py

@@ -212,6 +212,17 @@ class GtestTestInstanceTests(unittest.TestCase):
     self.assertEquals(1, actual[0].GetDuration())
     self.assertEquals(base_test_result.ResultType.FAIL, actual[0].GetType())
 
+  def testParseGTestOutput_skippedTest(self):
+    raw_output = [
+        '[ RUN      ] FooTest.Bar',
+        '[  SKIPPED ] FooTest.Bar (1 ms)',
+    ]
+    actual = gtest_test_instance.ParseGTestOutput(raw_output, None, None)
+    self.assertEquals(1, len(actual))
+    self.assertEquals('FooTest.Bar', actual[0].GetName())
+    self.assertEquals(1, actual[0].GetDuration())
+    self.assertEquals(base_test_result.ResultType.SKIP, actual[0].GetType())
+
   def testParseGTestXML_none(self):
     actual = gtest_test_instance.ParseGTestXML(None)
     self.assertEquals([], actual)