diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 18:23:31 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 18:23:31 +0000 |
| commit | 435f2887d2abe67afccc5e7907418265c793997b (patch) | |
| tree | 025f37729354ce39567bc16ba48d7f618722b1f0 /net | |
| parent | 03d53b5def320c0e22eb874ca3f62db3075b06ca (diff) | |
| download | chromium_src-435f2887d2abe67afccc5e7907418265c793997b.zip chromium_src-435f2887d2abe67afccc5e7907418265c793997b.tar.gz chromium_src-435f2887d2abe67afccc5e7907418265c793997b.tar.bz2 | |
Add xdisplaycheck as a dependency to net_unittests.
It is needed so net_unittests_run can archive xdisplaycheck.
R=rch@chromium.org
BUG=
Review URL: https://codereview.chromium.org/24630002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/net_unittests.isolate | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 9c88f77..61b8c47 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -16,23 +16,14 @@ ], }, }], - ['OS=="linux"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', + '../testing/test_env.py', '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'isolate_dependency_tracked': [ '../testing/test_env.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], @@ -46,15 +37,6 @@ ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', - '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ |