0

Revert "Use Xvfb in isolated testing only if use_x11 is set"

This reverts commit 8a7be07148.

We've been seeing a problem with tab_capture_end2end_tests
taking too much time on linux_gpu_triggered_tests (over 1 hour
as opposed to below 30 seconds).

This was traced to wrong command on the isolate server,
as can be seen e.g. with [1] (good) and [2] (bad).

From builder history I was able to narrow down suspect revision range to just
cafcab99f5 (good) [3] and 8a7be07148 (bad) [4].

There are only two CLs in that range, https://codereview.chromium.org/841693004
and https://codereview.chromium.org/813363003 . First one is just a histogram
description change, while the latter changes *.isolate files, which is much more
suspect.

[1] https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=13030c2ece3e5467ba858a978c685865181d32a6
[2] https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=104dec9bff0fc701eac105a80d7d64be5b43b033
[3] http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu_triggered_tests/builds/97223
[4] http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu_triggered_tests/builds/97224

TBR=spang
BUG=440882

Review URL: https://codereview.chromium.org/843713002

Cr-Commit-Position: refs/heads/master@{#310464}
This commit is contained in:
Paweł Hajdan, Jr
2015-01-08 10:33:38 +01:00
parent 75fa314307
commit 99ef9b4892
15 changed files with 225 additions and 221 deletions

@ -15,16 +15,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -34,20 +25,25 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/ash_unittests.exe',
'--test-launcher-bot-mode',
],
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',

@ -10,19 +10,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -35,6 +23,12 @@
],
'files': [
'../testing/xvfb.py',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
@ -48,6 +42,18 @@
'read_only': 1,
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'files': [

@ -37,7 +37,6 @@ def DefaultConfigVariables():
'target_arch': 'arm',
'use_openssl': '0',
'use_ozone': '0',
'use_x11': '0',
'v8_use_external_startup_data': '0',
}

@ -91,7 +91,6 @@
'--config-variable', 'use_openssl=<(use_openssl)',
'--config-variable', 'target_arch=<(target_arch)',
'--config-variable', 'use_ozone=<(use_ozone)',
'--config-variable', 'use_x11=<(use_x11)',
'--config-variable', 'disable_nacl=<(disable_nacl)',
],
'conditions': [

@ -3,18 +3,7 @@
# found in the LICENSE file.
{
'conditions': [
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -26,19 +15,19 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libclearkeycdm.so',
'<(PRODUCT_DIR)/libclearkeycdmadapter.so',
'<(PRODUCT_DIR)/libppapi_tests.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" and libpeer_target_type=="loadable_module"', {
'variables': {
'files': [
@ -169,6 +158,17 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['OS=="win"', {
'variables': {
'files': [

@ -3,18 +3,7 @@
# found in the LICENSE file.
{
'conditions': [
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -26,13 +15,6 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/libppapi_tests.so',
@ -40,6 +22,13 @@
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
@ -79,6 +68,17 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['OS=="win"', {
'variables': {
'files': [

@ -3,15 +3,7 @@
# found in the LICENSE file.
{
'conditions': [
['use_x11==0', {
'variables': {
'command': [
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -22,15 +14,15 @@
'files': [
'../testing/test_env.py',
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux"', {
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
@ -57,6 +49,14 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [

@ -39,19 +39,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -64,19 +52,19 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/locales/fr.pak',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
@ -105,6 +93,18 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['OS=="win"', {
'variables': {
'files': [

@ -33,18 +33,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -56,13 +45,6 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/content_shell.pak',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
@ -70,6 +52,13 @@
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
@ -95,6 +84,17 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['OS=="win"', {
'variables': {
'files': [

@ -33,19 +33,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
@ -58,20 +46,28 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.so',
'<(PRODUCT_DIR)/osmesa.so',
@ -80,6 +76,14 @@
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',

@ -12,19 +12,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
@ -37,14 +25,14 @@
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux"', {
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
@ -62,6 +50,18 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',

@ -21,19 +21,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
@ -46,14 +34,14 @@
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux"', {
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
@ -72,6 +60,18 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',

@ -11,19 +11,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
@ -36,14 +24,14 @@
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
@ -61,6 +49,18 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',

@ -12,19 +12,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
@ -37,14 +25,14 @@
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux"', {
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
@ -62,6 +50,18 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',

@ -11,19 +11,7 @@
],
},
}],
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
['use_x11==1', {
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
@ -36,14 +24,14 @@
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux"', {
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
@ -61,6 +49,18 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',