From adc48799090c5906abe37211c389aa588167d6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Fri, 17 Aug 2018 11:19:24 +0200 Subject: [PATCH] Make sure video_capture_tests run sequentially. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#24325} --- tools_webrtc/mb/gn_isolate_map.pyl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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": {