diff options
| author | spang <spang@chromium.org> | 2015-03-10 11:01:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-10 18:01:59 +0000 |
| commit | 386febffff89e5b08b7dc0a5d6bd992df385e0b8 (patch) | |
| tree | 6f0ec5b396b5d67ca737ed7283d455264ae57364 /build/isolate.gypi | |
| parent | 0c7df61f0cfe38fa7832f0d53f57a4642cdd0fcd (diff) | |
| download | chromium_src-386febffff89e5b08b7dc0a5d6bd992df385e0b8.zip chromium_src-386febffff89e5b08b7dc0a5d6bd992df385e0b8.tar.gz chromium_src-386febffff89e5b08b7dc0a5d6bd992df385e0b8.tar.bz2 | |
Use Xvfb in isolated testing only if use_x11 is set (reland)
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
Review URL: https://codereview.chromium.org/908313004
Cr-Commit-Position: refs/heads/master@{#319919}
Diffstat (limited to 'build/isolate.gypi')
| -rw-r--r-- | build/isolate.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index fbb6d3cf..5fa1e67 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -95,6 +95,7 @@ '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libraries)', '--config-variable', 'use_openssl=<(use_openssl)', '--config-variable', 'use_ozone=<(use_ozone)', + '--config-variable', 'use_x11=<(use_x11)', '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)', ], 'conditions': [ |