diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 01:09:28 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 01:09:28 +0000 |
commit | 7bc272f38646abb81b58c89a59d8e6842f9e9631 (patch) | |
tree | 8e3c884ad1549c445e86925df673fcd0d8285d1d /chrome_frame/chrome_frame.gyp | |
parent | 0923559a1a020690c1d199fda3c55f67d2d54335 (diff) | |
download | chromium_src-7bc272f38646abb81b58c89a59d8e6842f9e9631.zip chromium_src-7bc272f38646abb81b58c89a59d8e6842f9e9631.tar.gz chromium_src-7bc272f38646abb81b58c89a59d8e6842f9e9631.tar.bz2 |
Added support for running reliability tests for ChromeFrame on similar lines as Chrome. We only run these
tests for IE at this point. The reliability test code for Chrome has been copied and modified accordingly.
Other related changes in this CL include the following:-
1. If ChromeFrame is running in headless mode determined by a registry value in HKCU\Software\Google\ChromeFrame
we initialize ChromeFrame crash reporting and connect to the Chrome crash server. This would enable us to
gather crash dumps from the reliability test runs and report the same.
2. The LowIntegrity fixes for the WebBrowser which Stoyan had done a while back are only needed for IE7 on Vista.
For this CL though we just do the requisite hacks if the OS is Vista. For Windows7 the returned IWebBrowser
interface pointer works fine.
3. I moved the WebBrowserEventSink to chrome_frame_test_utils as this class is now shared.
Fixes portions of http://code.google.com/p/chromium/issues/detail?id=29451
Bug=29451
Review URL: http://codereview.chromium.org/465074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r-- | chrome_frame/chrome_frame.gyp | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 870f9da..905e34f 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -446,6 +446,8 @@ 'test/net/test_automation_provider.h', 'test/net/test_automation_resource_message_filter.cc', 'test/net/test_automation_resource_message_filter.h', + 'chrome_tab.h', + 'chrome_tab.idl', ], 'include_dirs': [ # To allow including "chrome_tab.h" @@ -465,6 +467,59 @@ }, { + 'target_name': 'chrome_frame_reliability_tests', + 'type': 'executable', + 'dependencies': [ + '../build/temp_gyp/googleurl.gyp:googleurl', + '../chrome/chrome.gyp:browser', + '../chrome/chrome.gyp:utility', + '../testing/gtest.gyp:gtest', + '../base/allocator/allocator.gyp:allocator', + 'chrome_frame_npapi', + 'chrome_frame_strings', + ], + 'sources': [ + 'test/reliability/run_all_unittests.cc', + 'test/reliability/page_load_test.cc', + 'test/reliability/page_load_test.h', + 'test/reliability/reliability_test_suite.h', + 'test/chrome_frame_test_utils.cc', + 'test/chrome_frame_test_utils.h', + 'chrome_tab.h', + 'chrome_tab.idl', + '../base/test/test_file_util_win.cc', + '../chrome/test/ui/ui_test.cc', + '../chrome/test/ui/ui_test_suite.cc', + '../chrome/test/ui/ui_test_suite.h', + '../chrome/test/chrome_process_util_win.cc', + '../chrome/test/chrome_process_util.cc', + '../chrome/test/chrome_process_util.h', + '../chrome/test/chrome_process_util_win.cc', + ], + 'include_dirs': [ + # To allow including "chrome_tab.h" + '<(INTERMEDIATE_DIR)', + ], + 'resource_include_dirs': [ + '<(INTERMEDIATE_DIR)', + ], + 'conditions': [ + ['OS=="win"', { + 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc', + ], + 'dependencies': [ + # TODO(slightlyoff): Get automation targets working on OS X + '../chrome/chrome.gyp:automation', + '../chrome/installer/installer.gyp:installer_util', + '../google_update/google_update.gyp:google_update', + ] + }], + ], + }, + + { 'target_name': 'chrome_frame_npapi', 'type': 'static_library', 'dependencies': [ |