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

Unified Diff: base/win/pe_image_unittest.cc

Issue 10083011: Fixes for the EnumeratesPE base_unittest failures seen on Windows 8 X64. The values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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: base/win/pe_image_unittest.cc
===================================================================
--- base/win/pe_image_unittest.cc (revision 132263)
+++ base/win/pe_image_unittest.cc (working copy)
@@ -121,12 +121,20 @@
const int win8_imports = 568;
const int win8_delay_imports = 113;
const int win8_relocs = 9478;
+ int win8_sections = 4;
+ int win8_import_dlls = 17;
+ base::win::OSInfo* os_info = base::win::OSInfo::GetInstance();
+ if (os_info->architecture() == base::win::OSInfo::X86_ARCHITECTURE) {
+ win8_sections = 5;
+ win8_import_dlls = 19;
+ }
+
// Contains the expected value, for each enumerated property (Value), and the
// OS version: [Value][os_version]
const int expected[][5] = {
- {4, 4, 4, 4, 5},
- {3, 3, 3, 13, 19},
+ {4, 4, 4, 4, win8_sections},
+ {3, 3, 3, 13, win8_import_dlls},
{w2k_delay_dlls, xp_delay_dlls, vista_delay_dlls, win7_delay_dlls,
win8_delay_dlls},
{w2k_exports, xp_exports, vista_exports, win7_exports, win8_exports},
« 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