From 4b7e67b1514e37b535eadf1e6c56375d3b79323f Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 17 Jun 2021 11:16:53 -0700 Subject: [PATCH] base,tests: Fix trace.test.cc for .fast Due to DPRINTFs compiling in all cases: https://gem5-review.googlesource.com/c/public/gem5/+/44988, trace.test.cc failed to compile for the .fast build (`scons build/NULL/unittests.fast`). This patch fixes this by moving the DPRINTFs into the `TRACING_ON` compile guards. Change-Id: Ib37b2d90f19b9dbc1503941d69d5a2dc0c1c9d9b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46959 Reviewed-by: Daniel Carvalho Maintainer: Bobby R. Bruce Tested-by: kokoro --- src/base/trace.test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/trace.test.cc b/src/base/trace.test.cc index beefbe4c62..45e6f6c11b 100644 --- a/src/base/trace.test.cc +++ b/src/base/trace.test.cc @@ -491,19 +491,19 @@ TEST(TraceTest, MacroDPRINTFS) Trace::enable(); EXPECT_TRUE(Debug::changeFlag("TraceTestDebugFlag", true)); EXPECT_TRUE(Debug::changeFlag("FmtFlag", true)); - DPRINTFS(TraceTestDebugFlag, named_ptr, "Test message"); #if TRACING_ON + DPRINTFS(TraceTestDebugFlag, named_ptr, "Test message"); ASSERT_EQ(getString(Trace::output()), " 0: TraceTestDebugFlag: Foo: Test message"); -#else - ASSERT_EQ(getString(Trace::output()), ""); #endif // Flag disabled Trace::disable(); EXPECT_TRUE(Debug::changeFlag("TraceTestDebugFlag", false)); +#if TRACING_ON DPRINTFS(TraceTestDebugFlag, named_ptr, "Test message"); ASSERT_EQ(getString(Trace::output()), ""); +#endif } /** Test DPRINTFR with tracing on. */