Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: cc/cc_tests.gyp

Issue 1256793002: use_x11==1 is a better condition for xdisplaycheck dep (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'cc_unit_tests_source_files': [ 8 'cc_unit_tests_source_files': [
9 'animation/animation_host_unittest.cc', 9 'animation/animation_host_unittest.cc',
10 'animation/animation_player_unittest.cc', 10 'animation/animation_player_unittest.cc',
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 ], 461 ],
462 'includes': [ 462 'includes': [
463 '../build/isolate.gypi', 463 '../build/isolate.gypi',
464 ], 464 ],
465 'sources': [ 465 'sources': [
466 'cc_unittests.isolate', 466 'cc_unittests.isolate',
467 ], 467 ],
468 'conditions': [ 468 'conditions': [
469 # crbug.com/464062 xdisplaycheck is used to run cc_unittests_run on 469 # crbug.com/464062 xdisplaycheck is used to run cc_unittests_run on
470 # the linux try bots when using X11. 470 # the linux try bots when using X11.
471 ['OS=="linux" and use_ozone==0', 471 ['use_x11==1',
472 { 472 {
473 'dependencies': [ 473 'dependencies': [
474 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 474 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
475 ], 475 ],
476 } 476 }
477 ], 477 ],
478 ], 478 ],
479 }, 479 },
480 ], 480 ],
481 }], 481 }],
482 ], 482 ],
483 } 483 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698