diff options
| author | spang <spang@chromium.org> | 2015-01-07 17:42:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-08 01:42:58 +0000 |
| commit | 8a7be0714892c0c6360c45d0d602c119873b468e (patch) | |
| tree | af22464953710702a55fd99549c7d9cd8d36564a /build | |
| parent | 3e81e58f707ef74a0fca1e00acfb9d0de8c91308 (diff) | |
| download | chromium_src-8a7be0714892c0c6360c45d0d602c119873b468e.zip chromium_src-8a7be0714892c0c6360c45d0d602c119873b468e.tar.gz chromium_src-8a7be0714892c0c6360c45d0d602c119873b468e.tar.bz2 | |
Use Xvfb in isolated testing only if use_x11 is set
We don't need a virtual X server for ozone testing, and it is causing
problems running the tests with swarming. This changes all isolate files
to only run Xvfb if use_x11==1 is set in GYP_DEFINES, and merges ozone
with Windows & Mac (none of which need to run their own display server).
BUG=440882
TEST=isolate.py run -s out_ozone/Debug/<various>
TBR=maruel@chromium.org
Review URL: https://codereview.chromium.org/813363003
Cr-Commit-Position: refs/heads/master@{#310434}
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/utils/isolator.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index afbee2a..0149df8 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -37,6 +37,7 @@ def DefaultConfigVariables(): 'target_arch': 'arm', 'use_openssl': '0', 'use_ozone': '0', + 'use_x11': '0', 'v8_use_external_startup_data': '0', } diff --git a/build/isolate.gypi b/build/isolate.gypi index e6d2f98..118dac1 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -91,6 +91,7 @@ '--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': [ |