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

Side by Side Diff: webkit/tools/test_shell/test_shell.gyp

Issue 115472: Disable plugins on the Mac by default until JS plumbing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'test_shell_windows_resource_files': [ 8 'test_shell_windows_resource_files': [
9 'resources/test_shell.rc', 9 'resources/test_shell.rc',
10 'resources/pan_east.cur', 10 'resources/pan_east.cur',
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 # TODO(port) 493 # TODO(port)
494 '../../../skia/ext/platform_canvas_unittest.cc', 494 '../../../skia/ext/platform_canvas_unittest.cc',
495 '../../glue/webplugin_impl_unittest.cc', 495 '../../glue/webplugin_impl_unittest.cc',
496 'plugin_tests.cc' 496 'plugin_tests.cc'
497 ], 497 ],
498 }], 498 }],
499 ['OS=="mac"', { 499 ['OS=="mac"', {
500 # mac tests load the resources from the built test_shell beside the 500 # mac tests load the resources from the built test_shell beside the
501 # test 501 # test
502 'dependencies': ['test_shell'], 502 'dependencies': ['test_shell'],
503 # TODO(port)
504 # disable plugin tests until we re-enable plugins for chromium.app
505 'sources!': [
506 'plugin_tests.cc',
507 ]
503 }], 508 }],
504 ['OS=="win"', { 509 ['OS=="win"', {
505 'msvs_disabled_warnings': [ 4800 ], 510 'msvs_disabled_warnings': [ 4800 ],
506 }, { # else: OS!=win 511 }, { # else: OS!=win
507 'sources!': [ 512 'sources!': [
508 '../../../skia/ext/image_operations_unittest.cc', 513 '../../../skia/ext/image_operations_unittest.cc',
509 '../../../skia/ext/skia_utils_unittest.cc', 514 '../../../skia/ext/skia_utils_unittest.cc',
510 '../../../skia/ext/vector_canvas_unittest.cc', 515 '../../../skia/ext/vector_canvas_unittest.cc',
511 '../webcore_unit_tests/UniscribeHelper_unittest.cpp', 516 '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
512 '../webcore_unit_tests/TransparencyWin_unittest.cpp', 517 '../webcore_unit_tests/TransparencyWin_unittest.cpp',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 'conditions': [ 587 'conditions': [
583 ['OS!="win"', { 588 ['OS!="win"', {
584 'sources!' : ['test_worker/test_worker.def'], 589 'sources!' : ['test_worker/test_worker.def'],
585 }], 590 }],
586 ], 591 ],
587 }, 592 },
588 ], 593 ],
589 }], 594 }],
590 ], 595 ],
591 } 596 }
OLDNEW
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698