Commit a81bdb91 authored by Keiichi Watanabe's avatar Keiichi Watanabe Committed by Commit Bot

testing/buildbot: Use vivid for capture_unittests on ChromeOS VM in CQ

Load vivid before running capture_unittests on chromeos-amd64-generic-rel.
This makes it possible to run test cases that require a webcam.

Bug: 852302, 904730
Change-Id: I5d4f5a1dd7a8ea27ef7eabd438fd766621573096
Signed-off-by: default avatarKeiichi Watanabe <keiichiw@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/1282424Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608688}
parent acc26cbf
...@@ -257,6 +257,13 @@ class GTestTest(RemoteTest): ...@@ -257,6 +257,13 @@ class GTestTest(RemoteTest):
vpython_spec_path), vpython_spec_path),
]) ])
# Load vivid before running capture_unittests
# TODO(crbug.com/904730): Once we start loading vivid in init service,
# we can remove this code.
if self._test_exe == 'capture_unittests':
vm_test_script_contents.append(
'echo "test0000" | sudo -S modprobe vivid n_devs=1 node_types=0x1')
test_invocation = ( test_invocation = (
'./%s --test-launcher-shard-index=%d ' './%s --test-launcher-shard-index=%d '
'--test-launcher-total-shards=%d' % ( '--test-launcher-total-shards=%d' % (
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
{ {
"args": [ "args": [
"--test-launcher-jobs=1", "--test-launcher-jobs=1",
"--gtest_filter=-*UsingRealWebcam*" "--gtest_filter=-*UsingRealWebcam_CaptureMjpeg*"
], ],
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
......
...@@ -371,9 +371,9 @@ ...@@ -371,9 +371,9 @@
'capture_unittests': { 'capture_unittests': {
'args': [ 'args': [
'--test-launcher-jobs=1', '--test-launcher-jobs=1',
# TODO(crbug.com/881300): After capture_unittests passes with vivid on VM, # Don't run CaptureMJpeg tests on ChromeOS VM because vivid,
# we can run UsingRealWebcam tests except CaptureMjpeg. # which is the virtual video capture device, doesn't support MJPEG.
'--gtest_filter=-*UsingRealWebcam*', '--gtest_filter=-*UsingRealWebcam_CaptureMjpeg*',
], ],
}, },
'cc_unittests': {}, 'cc_unittests': {},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment