commit 9b9f841a945966b399c30cf8a2e761ab0811f06c
author Pin-chih Lin <johnylin@google.com> Tue Jun 20 11:28:10 2017 +0800
committer chrome-bot <chrome-bot@chromium.org> Tue Jun 20 11:30:39 2017 -0700
tree bd6d54c843aad05be3fdd2b5a3ca5deee8a4541a
parent 1fa1d6a9bd9af72dacd180f93b9be5b48ade7f05

video_VEA: fix gtest_filter overwritten in stream loop

The bug was hit if predefined_filter differs between streams. Keep
gtest_filter as argument from commands and don't overwrite it.

BUG=chromium:728906
TEST=manual test

Change-Id: I44babb56ba7b63db666011d93b2057e38dd6bf61
Reviewed-on: https://chromium-review.googlesource.com/541177
Commit-Ready: Pin-chih Lin <johnylin@chromium.org>
Tested-by: Pin-chih Lin <johnylin@chromium.org>
Reviewed-by: Kuang-che Wu <kcwu@chromium.org>

client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py

diff --git a/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py b/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
index e981f5c..4c2349a 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
+++ b/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
@@ -141,10 +141,11 @@
             if gtest_filter and predefined_filter:
                 logging.warning('predefined gtest filter is suppressed: %s',
                     predefined_filter)
-            if not gtest_filter:
-                gtest_filter = predefined_filter
-            if gtest_filter:
-                cmd_line_list.append('--gtest_filter="%s"' % gtest_filter)
+                applied_filter = gtest_filter
+            else:
+                applied_filter = predefined_filter
+            if applied_filter:
+                cmd_line_list.append('--gtest_filter="%s"' % applied_filter)
 
             cmd_line = ' '.join(cmd_line_list)
             try: