zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update isolate files for swarming tests

Browse Source 
Xvfb is needed for the screen capture tests in modules_unittests,
which also brings in xdisplaycheck used by testing/xvfb.py.

libjingle_media_unittest was missing a resource video in the .isolate
file.

BUG=chromium:497757
R=stip@chromium.org

Review URL: https://codereview.webrtc.org/1415603005 .

Cr-Commit-Position: refs/heads/master@{#10365}
This commit is contained in:
Henrik Kjellander
2015-10-22 06:48:21 +02:00
parent 4f47ed45db
commit 9589e2af16
5 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/modules/modules_unittests.isolate
View File

@ -129,7 +129,7 @@
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', {
'variables': {
'command': [
'<(DEPTH)/testing/test_env.py',
@ -142,5 +142,22 @@
],
},
}],
['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==1', {
'variables': {
'command': [
'<(DEPTH)/testing/xvfb.py',
'<(PRODUCT_DIR)',
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
],
'files': [
'<(DEPTH)/DEPS',
'<(DEPTH)/testing/test_env.py',
'<(DEPTH)/testing/xvfb.py',
'<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}