From 386febffff89e5b08b7dc0a5d6bd992df385e0b8 Mon Sep 17 00:00:00 2001 From: spang Date: Tue, 10 Mar 2015 11:01:07 -0700 Subject: 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/ TBR=maruel Review URL: https://codereview.chromium.org/908313004 Cr-Commit-Position: refs/heads/master@{#319919} --- build/isolate.gypi | 1 + 1 file changed, 1 insertion(+) (limited to 'build/isolate.gypi') 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': [ -- cgit v1.1