diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 21:37:19 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 21:37:19 +0000 |
| commit | a97488fbfc5c97b21e01b90a2220f9a65877e31e (patch) | |
| tree | af663b6f29a98336fff6baffd41aa383ff1ed58c /chrome | |
| parent | 41120b4eb145ec0558b378315a411093a410c27e (diff) | |
| download | chromium_src-a97488fbfc5c97b21e01b90a2220f9a65877e31e.zip chromium_src-a97488fbfc5c97b21e01b90a2220f9a65877e31e.tar.gz chromium_src-a97488fbfc5c97b21e01b90a2220f9a65877e31e.tar.bz2 | |
Add xdisplaycheck as a dependency on Linux for tests that use the UI. This way we don't have to explicitly build xdisplaycheck on all the bots where we run tests.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/207020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index fb4f905..7e62012 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3806,6 +3806,11 @@ 'test/automated_ui_tests/automated_ui_tests.h', ], 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], ['OS=="win"', { 'include_dirs': [ 'third_party/wtl/include', @@ -3888,6 +3893,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ # TODO(port) @@ -4301,6 +4307,7 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources': [ 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', @@ -4481,6 +4488,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="linux" and toolkit_views==1', { @@ -4603,6 +4611,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="win" or (OS=="linux" and toolkit_views==1)', { @@ -4635,6 +4644,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="win"', { @@ -4667,6 +4677,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ], @@ -5233,6 +5244,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ # TODO(port): @@ -5307,6 +5319,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ # TODO(port) @@ -5430,6 +5443,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { @@ -6325,7 +6339,7 @@ }], ], }, - + { 'target_name': 'sync_unit_tests', 'type': 'executable', |