diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 21:29:27 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 21:29:27 +0000 |
| commit | 0bc9cc0a33fff5ff96a62f38e90293427821e1aa (patch) | |
| tree | ce1d7052ffda46309e3d927d87adaadd6c15f599 /chrome/chrome_tests.gypi | |
| parent | 142648d149fbb663fb405b0e46d32095964df0e1 (diff) | |
| download | chromium_src-0bc9cc0a33fff5ff96a62f38e90293427821e1aa.zip chromium_src-0bc9cc0a33fff5ff96a62f38e90293427821e1aa.tar.gz chromium_src-0bc9cc0a33fff5ff96a62f38e90293427821e1aa.tar.bz2 | |
Enable many of the NPAPI UI tests on Mac
BUG=none
TEST=N/A
Review URL: http://codereview.chromium.org/503029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rwxr-xr-x | chrome/chrome_tests.gypi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index e51bb02..cf983d0 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -166,8 +166,9 @@ '../build/linux/system.gyp:gtk', ], }], - ['OS!="win"', { + ['OS=="linux" or OS=="freebsd"', { 'sources!': [ + # TODO(port) 'test/ui/npapi_test_helper.cc', ], }], @@ -262,6 +263,9 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', + # run time dependencies + '../webkit/tools/test_shell/test_shell.gyp:npapi_layout_test_plugin', + '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', ], 'include_dirs': [ '..', @@ -358,8 +362,6 @@ 'test_support_common', '../google_update/google_update.gyp:google_update', '../views/views.gyp:views', - # run time dependency - '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', '<(allocator_target)', ], 'link_settings': { @@ -384,7 +386,6 @@ 'browser/printing/printing_layout_uitest.cc', 'browser/views/find_bar_host_uitest.cc', 'common/logging_chrome_uitest.cc', - 'test/ui/npapi_uitest.cc', 'test/ui/sandbox_uitests.cc', ], }], @@ -396,6 +397,10 @@ ], }], ], + 'sources!': [ + # TODO(port) + 'test/ui/npapi_uitest.cc', + ], }], ], }, |