Update isolate files for swarming tests

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

1
.gitignore vendored
View File

@ -155,6 +155,7 @@
/tools/valgrind /tools/valgrind
/tools/vim /tools/vim
/tools/win /tools/win
/tools/xdisplaycheck
/tools/whitespace.txt /tools/whitespace.txt
/webrtc/examples/android/media_demo/bin /webrtc/examples/android/media_demo/bin
/webrtc/examples/android/media_demo/gen /webrtc/examples/android/media_demo/gen

View File

@ -75,6 +75,7 @@ DIRECTORIES = [
'tools/valgrind', 'tools/valgrind',
'tools/vim', 'tools/vim',
'tools/win', 'tools/win',
'tools/xdisplaycheck',
] ]
from sync_chromium import get_target_os_list from sync_chromium import get_target_os_list

View File

@ -34,6 +34,7 @@
'files': [ 'files': [
'<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
'media/testdata/captured-320x240-2s-48.frames', 'media/testdata/captured-320x240-2s-48.frames',
'media/testdata/faces.1280x720_P420.yuv',
], ],
}, },
}], }],

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': { 'variables': {
'command': [ 'command': [
'<(DEPTH)/testing/test_env.py', '<(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)',
],
},
}],
], ],
} }

View File

@ -140,6 +140,11 @@
'CLANG_ENABLE_OBJC_ARC': 'YES', 'CLANG_ENABLE_OBJC_ARC': 'YES',
}, },
}], }],
['use_x11==1', {
'dependencies': [
'<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
], ],
}, },
{ {