aboutsummaryrefslogtreecommitdiff
path: root/tools_webrtc
diff options
context:
space:
mode:
authorPatrik Höglund <phoglund@webrtc.org>2018-08-17 11:19:24 +0200
committerCommit Bot <commit-bot@chromium.org>2018-08-17 09:54:52 +0000
commitadc48799090c5906abe37211c389aa588167d6a6 (patch)
tree3b405586dcf575710dc636a2c98d05d93124fc95 /tools_webrtc
parentaea32f9d6ad39424501cb5a8cb1ed3fdff0a8abb (diff)
downloadwebrtc-adc48799090c5906abe37211c389aa588167d6a6.tar.gz
Make sure video_capture_tests run sequentially.
Making video_capture_tests have the non_parallel_console_test_launcher type will pass --workers=1 to gtest-parallel, which ensures the tests execute sequentially. This is necessary now that we're accessing a real physical webcam, which is a system-wide resource that doesn't work well if several processes access it concurrently. Follow-ups: 1) get video_capture_test back up on Linux 2) drop sw webcams for Mac and Win 3) remove ensure_webcam_is_running.pu and surrounding machinery Bug: webrtc:9292 Change-Id: I5e3347ad234f6b942de736513075097d79c0fd36 Reviewed-on: https://webrtc-review.googlesource.com/94761 Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24325}
Diffstat (limited to 'tools_webrtc')
-rw-r--r--tools_webrtc/mb/gn_isolate_map.pyl3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools_webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl
index 5832dd1dd4..479c5eae79 100644
--- a/tools_webrtc/mb/gn_isolate_map.pyl
+++ b/tools_webrtc/mb/gn_isolate_map.pyl
@@ -120,7 +120,8 @@
},
"video_capture_tests": {
"label": "//modules/video_capture:video_capture_tests",
- "type": "console_test_launcher",
+ "type": "non_parallel_console_test_launcher",
+ # TODO(bugs.webrtc.org/9292): remove use_webcam and the ensure script.
"use_webcam": True,
},
"video_engine_tests": {