From 528df505b19485b0bfc47a83c1bf6384e03241d7 Mon Sep 17 00:00:00 2001
From: Doug Evans <dje@google.com>
Date: Wed, 27 Feb 2019 13:56:40 -0800
Subject: [PATCH] [ulib/trace-test-utils] Dump the incoming buffer at verbosity
level 2.
Change-Id: I1c5ea694d1b7c339932670ca8df7a120846494cb
---
zircon/system/ulib/trace-test-utils/BUILD.gn | 1 +
.../system/ulib/trace-test-utils/compare_records.cpp | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/zircon/system/ulib/trace-test-utils/BUILD.gn b/zircon/system/ulib/trace-test-utils/BUILD.gn
index 95e56066366..12096656afe 100644
--- a/zircon/system/ulib/trace-test-utils/BUILD.gn
+++ b/zircon/system/ulib/trace-test-utils/BUILD.gn
@@ -19,6 +19,7 @@ library("trace-test-utils") {
deps = [
"$zx/system/ulib/fbl",
"$zx/system/ulib/trace-reader",
+ "$zx/system/ulib/unittest",
"$zx/system/ulib/zircon",
]
}
diff --git a/zircon/system/ulib/trace-test-utils/compare_records.cpp b/zircon/system/ulib/trace-test-utils/compare_records.cpp
index 3c41e555bb8..78f6ab7e522 100644
--- a/zircon/system/ulib/trace-test-utils/compare_records.cpp
+++ b/zircon/system/ulib/trace-test-utils/compare_records.cpp
@@ -15,6 +15,7 @@
#include <fbl/string_buffer.h>
#include <trace-reader/reader.h>
#include <trace-reader/reader_internal.h>
+#include <unittest/unittest.h>
#include "trace-test-utils/read_records.h"
#include "trace-test-utils/squelch.h"
@@ -41,11 +42,17 @@ bool CompareRecords(const fbl::Vector<trace::Record>& records,
if (num_recs == max_num_records)
break;
const auto& record = records[i];
- fbl::String str = record.ToString();
- buf.Append(squelcher->Squelch(str.c_str()));
+ fbl::String from_str = record.ToString();
+ fbl::String to_str = squelcher->Squelch(from_str.c_str());
+
+ UNITTEST_TRACEF(2, "Squelch from: %s\n", from_str.c_str());
+ UNITTEST_TRACEF(2, "Squelch to: %s\n", to_str.c_str());
+
+ buf.Append(to_str);
buf.Append('\n');
++num_recs;
}
+
if (strcmp(buf.c_str(), expected) != 0) {
fprintf(stderr, "Records do not match expected contents:\n");
fprintf(stderr, "Buffer:\n%s\n", buf.c_str());
--
GitLab