Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Unified Diff: chrome_elf/blacklist/test/blacklist_test.cc

Issue 418033004: Fix chrome_elf_unittests on 64 bit builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698