commit d1e4bd628cb0599342e8983fed5a7b44194e47a8
author Wu-Cheng Li <wuchengli@chromium.org> Mon Mar 23 17:14:07 2015 +0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Mar 24 08:41:15 2015 +0000
tree 6a7faf339091fcdcc5edb449ef221ab5195739ef
parent 585e76585e4a0c45c925dbc85fe527b36a1eb6bb

Add --ozone-platform flag for VEA tests.

The main function of VEA test calls OzonePlatform::InitializeForUI.
It also needs --ozone-platform flag to correctly determine ozone
platform id.

BUG=chromium:467822
TEST=run the test on a freon device

Change-Id: If6466b53db1f5b37447cf1775ab1a35cb01e9877
Reviewed-on: https://chromium-review.googlesource.com/262096
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Tested-by: Wu-cheng Li <wuchengli@chromium.org>
Reviewed-by: Wu-cheng Li <wuchengli@chromium.org>
Commit-Queue: Wu-cheng Li <wuchengli@chromium.org>
Trybot-Ready: Wu-cheng Li <wuchengli@chromium.org>

client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py

diff --git a/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py b/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py
index 4c0f5b5..9d2a178 100644
--- a/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py
+++ b/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py
@@ -226,11 +226,15 @@
             # Insert the FPS requirement
             v.append(str(INPUT_FPS))
             test_stream_data.append(':'.join(v))
-        return [self.get_chrome_binary_path(VEA_BINARY),
-                '--gtest_filter=SimpleEncode/*/0',
-                '--test_stream_data=%s' % ';'.join(test_stream_data),
-                '--run_at_fps',
-                '--num_frames_to_encode=%d' % MAX_INT]
+        cmd_line = [
+            self.get_chrome_binary_path(VEA_BINARY),
+            '--gtest_filter=SimpleEncode/*/0',
+            '--test_stream_data=%s' % ';'.join(test_stream_data),
+            '--run_at_fps',
+            '--num_frames_to_encode=%d' % MAX_INT]
+        if utils.is_freon():
+            cmd_line.append('--ozone-platform=gbm')
+        return cmd_line
 
     def run_in_parallel(self, *commands):
         env = os.environ.copy()

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 6a48433..8450872 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
+++ b/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
@@ -8,6 +8,7 @@
 import os
 import urllib2
 
+from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import chrome_binary_test
 
@@ -72,6 +73,8 @@
 
             cmd_line = '--test_stream_data="%s:%s:%s:%s:%s:%s"' % (
                     input_path, width, height, profile, output_path, bit_rate)
+            if utils.is_freon():
+                cmd_line += ' --ozone-platform=gbm'
             try:
                 self.run_chrome_test_binary(BINARY, cmd_line, as_chronos=False)
             except error.TestFail as test_failure: