Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/42181 )
Change subject: base,tests: Add a stringstream which tracks all log output.
......................................................................
base,tests: Add a stringstream which tracks all log output.
Since gtest's SUCCEED() just throws away output sent to it, there needs
to be an alternative way to capture non-fatal warn, hack, or inform
messages. This change adds a stringstream called gtestLogOutput which
will accumulate all log messages so they can be inspected later. If you
want to see what output occurs as a result of a specific action, you can
flush out the stringstream with .str(""), perform that action, and then
check the stream's contents.
The stream also records the output of exiting logs like fatal and panic.
It's not 100% clear that these messages would be retrievable or useful,
but this at least maintains consistency between the two classes of
messages.
Change-Id: I9d6650feb77b676a5b2b1fc2542cdebf3c60ed34
---
M src/base/gtest/logging.cc
A src/base/gtest/logging.hh
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/src/base/gtest/logging.cc b/src/base/gtest/logging.cc
index d9cb9eb..7a7dfc2 100644
--- a/src/base/gtest/logging.cc
+++ b/src/base/gtest/logging.cc
@@ -25,6 +25,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "base/gtest/logging.hh"
+
#include <gtest/gtest.h>
#include <array>
@@ -33,6 +35,8 @@
#include "base/cprintf.hh"
#include "base/logging.hh"
+std::ostringstream gtestLogOutput;
+
namespace {
// This custom exception type will help prevent fatal exceptions from being
@@ -49,7 +53,12 @@
using Logger::Logger;
protected:
- void log(const Loc &loc, std::string s) override { SUCCEED() << s; }
+ void
+ log(const Loc &loc, std::string s) override
+ {
+ gtestLogOutput << s;
+ SUCCEED() << s;
+ }
};
class GTestExitLogger : public Logger
@@ -61,6 +70,7 @@
void
log(const Loc &loc, std::string s) override
{
+ gtestLogOutput << s;
std::cerr << loc.file << ":" << loc.line << ": " << s;
}
// Throw an exception to escape down to the gtest framework.
diff --git a/src/base/gtest/logging.hh b/src/base/gtest/logging.hh
new file mode 100644
index 0000000..e760884
--- /dev/null
+++ b/src/base/gtest/logging.hh
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sstream>
+
+extern std::ostringstream gtestLogOutput;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42181
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9d6650feb77b676a5b2b1fc2542cdebf3c60ed34
Gerrit-Change-Number: 42181
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
