summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-15 23:11:28 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-15 23:11:28 +0000
commitb7a12f7cfbace2b35037aac28d71b1a5159cad7e (patch)
treef75bb30b40ff0d88ea33e173b39b8ed02a75b49e
parente0e9c1df34aba9a40944802443581a9cf66f9ee5 (diff)
downloadchromium_src-b7a12f7cfbace2b35037aac28d71b1a5159cad7e.zip
chromium_src-b7a12f7cfbace2b35037aac28d71b1a5159cad7e.tar.gz
chromium_src-b7a12f7cfbace2b35037aac28d71b1a5159cad7e.tar.bz2
Adds baselines for windows 7
TEST=run base_unittests.exe on a Windows 7 machine BUG=none Review URL: http://codereview.chromium.org/466058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34623 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/pe_image_unittest.cc26
1 files changed, 17 insertions, 9 deletions
diff --git a/base/pe_image_unittest.cc b/base/pe_image_unittest.cc
index 2bfa062..1621843 100644
--- a/base/pe_image_unittest.cc
+++ b/base/pe_image_unittest.cc
@@ -108,17 +108,23 @@ int GetExpectedValue(Value value, DWORD os) {
const int w2k_imports = 357;
const int w2k_delay_imports = 0;
const int w2k_relocs = 7388;
+ const int win7_delay_dlls = 7;
+ const int win7_exports = 806;
+ const int win7_imports = 568;
+ const int win7_delay_imports = 71;
+ const int win7_relocs = 7812;
// Contains the expected value, for each enumerated property (Value), and the
// OS version: [Value][os_version]
- const int expected[][3] = {
- {4, 4, 4},
- {3, 3, 3},
- {w2k_delay_dlls, xp_delay_dlls, vista_delay_dlls},
- {w2k_exports, xp_exports, vista_exports},
- {w2k_imports, xp_imports, vista_imports},
- {w2k_delay_imports, xp_delay_imports, vista_delay_imports},
- {w2k_relocs, xp_relocs, vista_relocs}
+ const int expected[][4] = {
+ {4, 4, 4, 4},
+ {3, 3, 3, 13},
+ {w2k_delay_dlls, xp_delay_dlls, vista_delay_dlls, win7_delay_dlls},
+ {w2k_exports, xp_exports, vista_exports, win7_exports},
+ {w2k_imports, xp_imports, vista_imports, win7_imports},
+ {w2k_delay_imports, xp_delay_imports,
+ vista_delay_imports, win7_delay_imports},
+ {w2k_relocs, xp_relocs, vista_relocs, win7_relocs}
};
if (value > relocs)
@@ -127,8 +133,10 @@ int GetExpectedValue(Value value, DWORD os) {
os = 0; // 5.0
else if (51 == os || 52 == os)
os = 1;
- else if (os >= 60)
+ else if (os == 60)
os = 2; // 6.x
+ else if (os >= 61)
+ os = 3;
else
return 0;