From bbceb0fd290f05efdb26ee71e5b56759462afcfb Mon Sep 17 00:00:00 2001 From: "amanda@chromium.org" Date: Fri, 8 May 2009 14:56:02 +0000 Subject: Copy layout test plugin into TestShell.app bundle where the layout tests can find it. Turn on the first passing plugin layout test on the Mac (testing javascript plumbing but not drawing, which does not work correctly yet). Depends on gyp changes in http://codereview.chromium.org/113111. Roll DEPS to pick up that change. Review URL: http://codereview.chromium.org/115099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15636 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/layout_tests/test_expectations.txt | 2 +- webkit/tools/test_shell/test_shell.gyp | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 65a5338..50f992f 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1201,7 +1201,7 @@ BUG10351 MAC LINUX : LayoutTests/plugins/netscape-get-property-return-value.html BUG10351 MAC LINUX : LayoutTests/plugins/netscape-identifier-conversion.html = FAIL BUG10351 MAC LINUX : LayoutTests/plugins/netscape-invoke-default.html = FAIL BUG10351 LINUX : LayoutTests/plugins/open-and-close-window-with-plugin.html = FAIL -BUG10351 MAC LINUX : LayoutTests/plugins/plugin-javascript-access.html = FAIL +BUG10351 LINUX : LayoutTests/plugins/plugin-javascript-access.html = FAIL BUG10351 MAC LINUX : LayoutTests/plugins/plugin-remove-subframe.html = FAIL BUG10351 MAC LINUX : LayoutTests/plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html = TIMEOUT BUG10667 LINUX MAC : chrome/plugins/get-file-url.html = CRASH TIMEOUT diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index ad29b5d..2c4e37a 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -260,7 +260,15 @@ 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], 'process_outputs_as_mac_bundle_resources': 1, }, - ] + ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/PlugIns/', + 'files': [ + '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/', + ], + }, + ], }, { # OS != "mac" 'dependencies': [ '../../../net/net.gyp:net_resources', @@ -323,6 +331,8 @@ # ], }], ['OS=="mac"', { + 'product_name': 'TestNetscapePlugIn', + 'product_extension': 'plugin', 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', -- cgit v1.1