diff options
author | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2015-01-08 10:33:38 +0100 |
---|---|---|
committer | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2015-01-08 09:35:08 +0000 |
commit | 99ef9b4892ce79eef6f758cad66de092a72e9bc1 (patch) | |
tree | 90543dea3e67c46682b5d121a89df4e21d33790d /chrome | |
parent | 75fa3143079daeb0219640db9d9a365ac7e27742 (diff) | |
download | chromium_src-99ef9b4892ce79eef6f758cad66de092a72e9bc1.zip chromium_src-99ef9b4892ce79eef6f758cad66de092a72e9bc1.tar.gz chromium_src-99ef9b4892ce79eef6f758cad66de092a72e9bc1.tar.bz2 |
Revert "Use Xvfb in isolated testing only if use_x11 is set"
This reverts commit 8a7be0714892c0c6360c45d0d602c119873b468e.
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
cafcab99f5ea (good) [3] and 8a7be0714892 (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}
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser_tests.isolate | 34 | ||||
-rw-r--r-- | chrome/interactive_ui_tests.isolate | 36 | ||||
-rw-r--r-- | chrome/sync_integration_tests.isolate | 26 | ||||
-rw-r--r-- | chrome/unit_tests.isolate | 36 |
4 files changed, 66 insertions, 66 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index b451d75..4956977 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -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,16 +15,16 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libclearkeycdm.so', + '<(PRODUCT_DIR)/libclearkeycdmadapter.so', + '<(PRODUCT_DIR)/libppapi_tests.so', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libclearkeycdm.so', - '<(PRODUCT_DIR)/libclearkeycdmadapter.so', - '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -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': [ diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index b008bb42..bef0495 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -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,17 +15,17 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/pyproto/google/', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/libppapi_tests.so', - '<(PRODUCT_DIR)/pyproto/google/', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -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': [ diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 20640c7..3c5e0e1 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -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': [ diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index c9391dc..446550b 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -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,16 +52,16 @@ ], 'files': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/locales/fr.pak', ], }, }], - ['OS=="linux"', { + ['OS=="linux" and use_ozone==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/locales/fr.pak', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], @@ -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': [ |