diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 17:24:21 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 17:24:21 +0000 |
| commit | ce0779958aa9dcece392fb0508900d533a0806a9 (patch) | |
| tree | 37a00106fb4c493e9f89c1b6873f739d11b44fe0 /webkit/tools/test_shell/test_shell.gypi | |
| parent | f8e2d019c8369d49ea905f1539804e392fa113f2 (diff) | |
| download | chromium_src-ce0779958aa9dcece392fb0508900d533a0806a9.zip chromium_src-ce0779958aa9dcece392fb0508900d533a0806a9.tar.gz chromium_src-ce0779958aa9dcece392fb0508900d533a0806a9.tar.bz2 | |
Move the click-to-play tests from plugin_test to browser_test. Then I'm planning on getting rid of plugin_tests (it's huge since it links in chrome, most of the tests are disabled, and we can put them in browser_tests and only work if the plugin is installed).
I made the click to play test use our test plugin instead of Flash so that it can run on all machines.
BUG=121574,113057
TBR=darin
Review URL: http://codereview.chromium.org/10380011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.gypi')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index e706d04..40696cc 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -615,6 +615,8 @@ '../../plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h', '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc', '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.h', + '../../plugins/npapi/test/plugin_execute_stream_javascript.cc', + '../../plugins/npapi/test/plugin_execute_stream_javascript.h', '../../plugins/npapi/test/plugin_get_javascript_url_test.cc', '../../plugins/npapi/test/plugin_get_javascript_url_test.h', '../../plugins/npapi/test/plugin_get_javascript_url2_test.cc', @@ -680,12 +682,6 @@ ], }, }], - ['os_posix == 1 and OS != "mac"', { - 'sources!': [ - # Needs simple event record type porting - '../../plugins/npapi/test/plugin_windowless_test.cc', - ], - }], ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] |