diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 21:21:31 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 21:21:31 +0000 |
| commit | 6e828bae0acee392345265b093ca812c17494253 (patch) | |
| tree | e03a153630690b426660176bc856c692ca7b57da /chrome_elf | |
| parent | d7e69fa79eb5d08e7e0f978c66c92a69f741f215 (diff) | |
| download | chromium_src-6e828bae0acee392345265b093ca812c17494253.zip chromium_src-6e828bae0acee392345265b093ca812c17494253.tar.gz chromium_src-6e828bae0acee392345265b093ca812c17494253.tar.bz2 | |
Fix chrome_elf_unittests on 64 bit builds.
BUG=397137,396244
TEST=chrome_elf_unittests
NOTRY=true
Review URL: https://codereview.chromium.org/418033004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/blacklist/test/blacklist_test.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc index 4f9859d..22edf6e 100644 --- a/chrome_elf/blacklist/test/blacklist_test.cc +++ b/chrome_elf/blacklist/test/blacklist_test.cc @@ -73,7 +73,17 @@ class BlacklistTest : public testing::Test { struct TestData { const wchar_t* dll_name; const wchar_t* dll_beacon; -} test_data[] = {{kTestDllName2, kDll2Beacon}, {kTestDllName3, kDll3Beacon}}; +} test_data[] = { + {kTestDllName2, kDll2Beacon}, +#if !defined(_WIN64) + // The third test dll is special in that it does not contain an export + // table. This prevents SafeGetImageInfo from extracting the name from there + // AND for some reason NtQueryVirtualMemory with MemorySectionName returns + // STATUS_ACCESS_VIOLATION in 64 bit builds for reasons still unknown. + // http://crbug.com/397137 + {kTestDllName3, kDll3Beacon} +#endif +}; TEST_F(BlacklistTest, Beacon) { // Ensure that the beacon state starts off 'running' for this version. |