diff options
| author | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 22:47:08 +0000 |
|---|---|---|
| committer | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 22:47:08 +0000 |
| commit | c2d8241ecb4b0667bdfc6273f97b237ab1b0862c (patch) | |
| tree | 3aa9d37771e7fc981c98c9d45c97ee7e166e399f | |
| parent | 7f92081e1532680a0dcb75a8e040ab52ca25950d (diff) | |
| download | chromium_src-c2d8241ecb4b0667bdfc6273f97b237ab1b0862c.zip chromium_src-c2d8241ecb4b0667bdfc6273f97b237ab1b0862c.tar.gz chromium_src-c2d8241ecb4b0667bdfc6273f97b237ab1b0862c.tar.bz2 | |
Add the required xvfb testing tool to the isolate target for some tests.
Missing from base_unit_tests, unit_tests and browser_tests.
TBR=brettw@chromium.org
R=maruel@chromium.org, brettw@chromium.org
BUG=None
TEST=local clean ; gyp ; build ; run isolate for base
Review URL: https://codereview.chromium.org/388843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283063 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 7 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 7 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp index 0d42bee..3356db2 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1496,6 +1496,13 @@ 'sources': [ 'base_unittests.isolate', ], + 'conditions': [ + ['use_x11 == 1', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], + ], }, ], }], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 65b20fb..7591a31 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2844,6 +2844,13 @@ 'sources': [ 'browser_tests.isolate', ], + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], + ], }, { 'target_name': 'content_gl_tests_run', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index fd6d728..80332cb 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2918,6 +2918,13 @@ 'sources': [ 'unit_tests.isolate', ], + 'conditions': [ + ['use_x11 == 1', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], + ], }, ], }], |