Use Xvfb in isolated testing only if use_x11 is set

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

Committed: https://crrev.com/8a7be0714892c0c6360c45d0d602c119873b468e
Cr-Commit-Position: refs/heads/master@{#310434}

[spang, 2015-01-07 19:41:41]

spang@chromium.org changed reviewers:
+ maruel@chromium.org

[spang, 2015-01-07 21:16:57]

spang@chromium.org changed reviewers:
+ jam@chromium.org

[spang, 2015-01-07 21:16:57]

+jam

[M-A Ruel, 2015-01-07 21:43:08]

https://codereview.chromium.org/813363003/diff/1/ash/ash_unittests.isolate
File ash/ash_unittests.isolate (right):

https://codereview.chromium.org/813363003/diff/1/ash/ash_unittests.isolate#ne...
ash/ash_unittests.isolate:18: ['OS=="linux" and use_x11==1', {
I'd prefer to simplify the condition;

['use_x11==1', {
  'command': [
    xvfb.py PRODUCT_DIR ...
  ],
  'files': [ xvfb.py and xdisplaycheck ],
}
['use_x11==0', {
  'command': [
    '../testing/test_env.py',
    '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
    '--test-launcher-bot-mode',
  ],
}

[spang, 2015-01-07 21:59:17]

https://codereview.chromium.org/813363003/diff/1/ash/ash_unittests.isolate
File ash/ash_unittests.isolate (right):

https://codereview.chromium.org/813363003/diff/1/ash/ash_unittests.isolate#ne...
ash/ash_unittests.isolate:18: ['OS=="linux" and use_x11==1', {
On 2015/01/07 21:43:07, M-A Ruel wrote:
> I'd prefer to simplify the condition;
> 
> ['use_x11==1', {
>   'command': [
>     xvfb.py PRODUCT_DIR ...
>   ],
>   'files': [ xvfb.py and xdisplaycheck ],
> }
> ['use_x11==0', {
>   'command': [
>     '../testing/test_env.py',
>     '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
>     '--test-launcher-bot-mode',
>   ],
> }

Done.

[M-A Ruel, 2015-01-07 22:39:45]

Good, the only thing missing is updating
src/build/android/pylib/utils/isolator.py to specify use_x11=0. Then the patch
is good to go.

[spang, 2015-01-07 22:52:14]

On 2015/01/07 22:39:45, M-A Ruel wrote:
> Good, the only thing missing is updating
> src/build/android/pylib/utils/isolator.py to specify use_x11=0. Then the patch
> is good to go.

Done.

[M-A Ruel, 2015-01-07 23:04:06]

The CQ bit was checked by maruel@chromium.org

[M-A Ruel, 2015-01-07 23:04:06]

lgtm

[commit-bot: I haz the power, 2015-01-07 23:05:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/813363003/60001

[commit-bot: I haz the power, 2015-01-07 23:13:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-07 23:13:15]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[M-A Ruel, 2015-01-07 23:14:40]

On 2015/01/07 23:13:15, I haz the power (commit-bot) wrote:
> Try jobs failed on following builders:
>   chromium_presubmit on tryserver.chromium.linux
>
(http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

Fixed CL description.

[M-A Ruel, 2015-01-07 23:14:44]

The CQ bit was checked by maruel@chromium.org

[commit-bot: I haz the power, 2015-01-07 23:16:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/813363003/60001

[commit-bot: I haz the power, 2015-01-08 01:42:46]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-01-08 01:43:40]

Patchset 4 (id:??) landed as
https://crrev.com/8a7be0714892c0c6360c45d0d602c119873b468e
Cr-Commit-Position: refs/heads/master@{#310434}