commit 8c79fdf7a5bc38d2f6e8c14b80e2714eb9cd29f5
author Daniel Hung-yu Wu <hywu@chromium.org> Wed Sep 13 17:54:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 13 17:54:19 2017 +0000
tree d254486b1fcbd2b18129e0a63bd990f402f5433f
parent f5824298d61a0c1560905818c47209b1c20214ef
parent 733709570c453c2fad54391766143ddd0040ff11

camera_HAL3Perf: parse output logs even when test fails
am: 733709570c

Change-Id: I666df41944816de51ee1c749063ff09920bec9f4

client/site_tests/camera_HAL3Perf/camera_HAL3Perf.py

diff --git a/client/site_tests/camera_HAL3Perf/camera_HAL3Perf.py b/client/site_tests/camera_HAL3Perf/camera_HAL3Perf.py
index 55d6381..b0ec612 100644
--- a/client/site_tests/camera_HAL3Perf/camera_HAL3Perf.py
+++ b/client/site_tests/camera_HAL3Perf/camera_HAL3Perf.py
@@ -85,9 +85,10 @@
             '--gtest_filter=Camera3StillCaptureTest/'
             'Camera3SimpleStillCaptureTest.PerformanceTest/*',
             '--output_log=%s' % test_log_file]
-        if utils.system(' '.join([binary_path, ' '.join(args)]),
-                        timeout=self.timeout) != 0:
+        ret = utils.system(' '.join([binary_path, ' '.join(args)]),
+                           timeout=self.timeout)
+        self._analyze_log(test_log_file)
+        if ret != 0:
             msg = 'Failed to execute command: ' + ' '.join([binary_path,
                                                            ' '.join(args)])
             raise error.TestFail(msg)
-        self._analyze_log(test_log_file)