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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: syzygy/agent/asan/error_info_unittest.cc

Issue 2363733003: Make syzyasan_rtl compile in 64 bit (Closed)
Patch Set: Created 4 years, 3 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 | « syzygy/agent/asan/block.cc ('k') | syzygy/agent/asan/logger_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: syzygy/agent/asan/error_info_unittest.cc
diff --git a/syzygy/agent/asan/error_info_unittest.cc b/syzygy/agent/asan/error_info_unittest.cc
index b83ca1e9014fcbc0d7e88760f5ed310987ad68c9..15dc519ef9cc1079f11b8ba4d4eb0acd1b61e517 100644
--- a/syzygy/agent/asan/error_info_unittest.cc
+++ b/syzygy/agent/asan/error_info_unittest.cc
@@ -316,7 +316,11 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfo) {
EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
const char kExpected[] =
"{\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -352,7 +356,11 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfo) {
EXPECT_TRUE(crashdata::ToJson(true, &value, &json));
const char kExpected[] =
"{\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"quarantined (flooded)\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -373,7 +381,11 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfo) {
" \"milliseconds-since-free\": 100,\n"
" \"contents\": {\n"
" \"type\": \"blob\",\n"
+#ifndef _WIN64
" \"address\": \"0x%08X\",\n"
+#else
+ " \"address\": \"0x%08llX\",\n"
+#endif
" \"size\": null,\n"
" \"data\": [\n"
" \"0x80\", \"0xCA\", \"0x00\", \"0x00\", \"0x20\", \"0x00\","
@@ -388,6 +400,10 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfo) {
#endif
" \"0xC3\", \"0xC3\", \"0xC3\", \"0xC3\", \"0x00\", \"0x00\","
" \"0x00\", \"0x00\",\n"
+#ifdef _WIN64
+ " \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
+ " \"0x00\", \"0x00\",\n"
+#endif
" \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
" \"0x00\", \"0x00\",\n"
" \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
@@ -396,14 +412,18 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfo) {
" },\n"
" \"shadow\": {\n"
" \"type\": \"blob\",\n"
- " \"address\": \"0x%08zX\",\n"
Ignat Loskutov 2016/09/22 22:00:36 What's wrong about %08zX?
+#ifndef _WIN64
+ " \"address\": \"0x%08X\",\n"
+#else
+ " \"address\": \"0x%08llX\",\n"
+#endif
" \"size\": null,\n"
" \"data\": [\n"
#ifndef _WIN64
" \"0xE0\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\", \"0xF4\"\n"
#else
" \"0xE0\", \"0xFA\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\","
- " \"0xF4\"\n"
+ " \"0xFB\", \"0xF4\"\n"
#endif
" ]\n"
" }\n"
@@ -428,7 +448,11 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfoWithMemoryRanges) {
EXPECT_TRUE(crashdata::ToJson(true, &info, &json));
const char kExpected[] =
"{\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -465,7 +489,11 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfoWithMemoryRanges) {
EXPECT_TRUE(crashdata::ToJson(true, &value, &json));
const char kExpected[] =
"{\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"quarantined (flooded)\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -490,7 +518,7 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfoWithMemoryRanges) {
#ifndef _WIN64
" \"size\": 48,\n"
#else
- " \"size\": 56,\n"
+ " \"size\": 64,\n"
#endif
" \"data\": null\n"
" },\n"
@@ -500,7 +528,7 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfoWithMemoryRanges) {
#ifndef _WIN64
" \"size\": 6,\n"
#else
- " \"size\": 7,\n"
+ " \"size\": 8,\n"
#endif
" \"data\": null\n"
" }\n"
@@ -516,7 +544,7 @@ TEST_F(AsanErrorInfoTest, PopulateBlockInfoWithMemoryRanges) {
#ifndef _WIN64
size_t kExpectedMemoryRangesSize[] = {48, 6};
#else
- size_t kExpectedMemoryRangesSize[] = {56, 7};
+ size_t kExpectedMemoryRangesSize[] = {64, 8};
#endif
for (int i = 0; i < 2; i++) {
EXPECT_EQ(kExpectedMemoryRangesAddresses[i], memory_ranges[i].first);
@@ -548,7 +576,11 @@ TEST_F(AsanErrorInfoTest, PopulateCorruptBlockRange) {
" \"block-count\": 100,\n"
" \"blocks\": [\n"
" {\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -614,7 +646,11 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfo) {
" \"location\": \"0x00001000\",\n"
" \"crash-stack-id\": 1234,\n"
" \"block-info\": {\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -645,6 +681,10 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfo) {
#endif
" \"0xC3\", \"0xC3\", \"0xC3\", \"0xC3\", \"0x00\", \"0x00\","
" \"0x00\", \"0x00\",\n"
+#ifdef _WIN64
+ " \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
+ " \"0x00\", \"0x00\",\n"
+#endif
" \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
" \"0x00\", \"0x00\",\n"
" \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\", \"0x00\","
@@ -660,7 +700,7 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfo) {
" \"0xE0\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\", \"0xF4\"\n"
#else
" \"0xE0\", \"0xFA\", \"0xFA\", \"0x00\", \"0xFB\", \"0xFB\","
- " \"0xF4\"\n"
+ " \"0xFB\", \"0xF4\"\n"
#endif
" ]\n"
" }\n"
@@ -711,7 +751,11 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfo) {
" \"block-count\": 100,\n"
" \"blocks\": [\n"
" {\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -798,7 +842,11 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfoWithMemoryRanges) {
" \"location\": \"0x00001000\",\n"
" \"crash-stack-id\": 1234,\n"
" \"block-info\": {\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -814,21 +862,23 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfoWithMemoryRanges) {
" ],\n"
" \"contents\": {\n"
" \"type\": \"blob\",\n"
- " \"address\": \"0x%08zX\",\n"
#ifndef _WIN64
+ " \"address\": \"0x%08zX\",\n"
" \"size\": 48,\n"
#else
- " \"size\": 56,\n"
+ " \"address\": \"0x%08llX\",\n"
+ " \"size\": 64,\n"
#endif
" \"data\": null\n"
" },\n"
" \"shadow\": {\n"
" \"type\": \"blob\",\n"
- " \"address\": \"0x%08zX\",\n"
#ifndef _WIN64
+ " \"address\": \"0x%08zX\",\n"
" \"size\": 6,\n"
#else
- " \"size\": 7,\n"
+ " \"address\": \"0x%08llX\",\n"
+ " \"size\": 8,\n"
#endif
" \"data\": null\n"
" }\n"
@@ -839,14 +889,22 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfoWithMemoryRanges) {
" \"shadow-memory-index\": 512,\n"
" \"shadow-memory\": {\n"
" \"type\": \"blob\",\n"
+#ifndef _WIN64
" \"address\": \"0x%08zX\",\n"
+#else
+ " \"address\": \"0x%08llX\",\n"
+#endif
" \"size\": 64,\n"
" \"data\": null\n"
" },\n"
" \"page-bits-index\": 0,\n"
" \"page-bits\": {\n"
" \"type\": \"blob\",\n"
+#ifndef _WIN64
" \"address\": \"0x%08zX\",\n"
+#else
+ " \"address\": \"0x%08llX\",\n"
+#endif
" \"size\": 3,\n"
" \"data\": null\n"
" },\n"
@@ -860,7 +918,11 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfoWithMemoryRanges) {
" \"block-count\": 100,\n"
" \"blocks\": [\n"
" {\n"
+#ifndef _WIN64
" \"header\": \"0x%08X\",\n"
+#else
+ " \"header\": \"0x%08llX\",\n"
+#endif
" \"user-size\": 8,\n"
" \"state\": \"allocated\",\n"
" \"heap-type\": \"WinHeap\",\n"
@@ -912,7 +974,7 @@ TEST_F(AsanErrorInfoTest, PopulateErrorInfoWithMemoryRanges) {
#ifndef _WIN64
size_t kExpectedMemoryRangesSize[] = {48, 6, 64, 3};
#else
- size_t kExpectedMemoryRangesSize[] = {56, 7, 64, 3};
+ size_t kExpectedMemoryRangesSize[] = {64, 8, 64, 3};
#endif
for (int i = 0; i < memory_ranges.size(); i++) {
EXPECT_EQ(kExpectedMemoryRangesAddresses[i], memory_ranges[i].first)
« no previous file with comments | « syzygy/agent/asan/block.cc ('k') | syzygy/agent/asan/logger_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698