| Index: chrome_elf/blacklist/test/blacklist_test.cc
|
| diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc
|
| index 4f9859db9cc93adc0133e28ab690daffbc9eb4d4..22edf6ef5f75fc8505be4be9039974d5d258e7b3 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.
|
|
|