diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 21:36:37 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 21:36:37 +0000 |
| commit | 912a03c7587ba6aa77ff65372815ae26ceb99e9d (patch) | |
| tree | 329c5a7f3252320a684a12f8ce96618d36b92cd4 /chrome_frame | |
| parent | c4b3c497275e61188d5ffcf0a453c895aaad21bc (diff) | |
| download | chromium_src-912a03c7587ba6aa77ff65372815ae26ceb99e9d.zip chromium_src-912a03c7587ba6aa77ff65372815ae26ceb99e9d.tar.gz chromium_src-912a03c7587ba6aa77ff65372815ae26ceb99e9d.tar.bz2 | |
Disable DllRedirectorLoadingTest.TestDllRedirection for component builds.
BUG=110492
TEST=none
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/9270056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/dll_redirector_loading_test.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index f19cbde..bba490f 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -122,7 +122,16 @@ scoped_ptr<Version> DllRedirectorLoadingTest::original_version_; scoped_ptr<Version> DllRedirectorLoadingTest::new_version_; ScopedTempDir DllRedirectorLoadingTest::temp_dir_; -TEST_F(DllRedirectorLoadingTest, TestDllRedirection) { +#if defined(COMPONENT_BUILD) +// Disabling since npchrome_frame.dll's DllMain can't handle being loaded into +// a process that has already started services in base.dll such as logging; see +// http://crbug.com/110492. +#define MAYBE_TestDllRedirection DISABLED_TestDllRedirection +#else +#define MAYBE_TestDllRedirection TestDllRedirection +#endif + +TEST_F(DllRedirectorLoadingTest, MAYBE_TestDllRedirection) { struct TestData { FilePath first_dll; FilePath second_dll; |