diff --git a/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp b/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp index 4837ac96b9b26..1d4208b6a2aa0 100644 --- a/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp +++ b/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp @@ -326,8 +326,10 @@ void ScudoCombinedTest::BasicTest(scudo::uptr SizeLog) { } } - Allocator->printStats(); - Allocator->printFragmentationInfo(); + if (TEST_HAS_FAILURE) { + Allocator->printStats(); + Allocator->printFragmentationInfo(); + } } #define SCUDO_MAKE_BASIC_TEST(SizeLog) \ diff --git a/compiler-rt/lib/scudo/standalone/tests/primary_test.cpp b/compiler-rt/lib/scudo/standalone/tests/primary_test.cpp index 1f5df28fd7771..3a087c497b1a9 100644 --- a/compiler-rt/lib/scudo/standalone/tests/primary_test.cpp +++ b/compiler-rt/lib/scudo/standalone/tests/primary_test.cpp @@ -230,9 +230,11 @@ SCUDO_TYPED_TEST(ScudoPrimaryTest, BasicPrimary) { } SizeClassAllocator.destroy(nullptr); Allocator->releaseToOS(scudo::ReleaseToOS::Force); - scudo::ScopedString Str; - Allocator->getStats(&Str); - Str.output(); + if (TEST_HAS_FAILURE) { + scudo::ScopedString Str; + Allocator->getStats(&Str); + Str.output(); + } } struct SmallRegionsConfig { @@ -289,10 +291,12 @@ TEST(ScudoPrimaryTest, Primary64OOM) { SizeClassAllocator.destroy(nullptr); Allocator.releaseToOS(scudo::ReleaseToOS::Force); - scudo::ScopedString Str; - Allocator.getStats(&Str); - Str.output(); EXPECT_EQ(AllocationFailed, true); + if (TEST_HAS_FAILURE) { + scudo::ScopedString Str; + Allocator.getStats(&Str); + Str.output(); + } Allocator.unmapTestOnly(); } @@ -328,9 +332,11 @@ SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryIterate) { } SizeClassAllocator.destroy(nullptr); Allocator->releaseToOS(scudo::ReleaseToOS::Force); - scudo::ScopedString Str; - Allocator->getStats(&Str); - Str.output(); + if (TEST_HAS_FAILURE) { + scudo::ScopedString Str; + Allocator->getStats(&Str); + Str.output(); + } } SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryThreaded) { @@ -385,11 +391,13 @@ SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryThreaded) { for (auto &T : Threads) T.join(); Allocator->releaseToOS(scudo::ReleaseToOS::Force); - scudo::ScopedString Str; - Allocator->getStats(&Str); - Allocator->getFragmentationInfo(&Str); - Allocator->getMemoryGroupFragmentationInfo(&Str); - Str.output(); + if (TEST_HAS_FAILURE) { + scudo::ScopedString Str; + Allocator->getStats(&Str); + Allocator->getFragmentationInfo(&Str); + Allocator->getMemoryGroupFragmentationInfo(&Str); + Str.output(); + } } // Through a simple allocation that spans two pages, verify that releaseToOS diff --git a/compiler-rt/lib/scudo/standalone/tests/quarantine_test.cpp b/compiler-rt/lib/scudo/standalone/tests/quarantine_test.cpp index 54d42edc374e5..e3e983be54574 100644 --- a/compiler-rt/lib/scudo/standalone/tests/quarantine_test.cpp +++ b/compiler-rt/lib/scudo/standalone/tests/quarantine_test.cpp @@ -216,9 +216,11 @@ TEST(ScudoQuarantineTest, GlobalQuarantine) { Quarantine.drainAndRecycle(&Cache, Cb); EXPECT_EQ(Cache.getSize(), 0UL); - scudo::ScopedString Str; - Quarantine.getStats(&Str); - Str.output(); + if (TEST_HAS_FAILURE) { + scudo::ScopedString Str; + Quarantine.getStats(&Str); + Str.output(); + } } struct PopulateQuarantineThread { @@ -248,9 +250,11 @@ TEST(ScudoQuarantineTest, ThreadedGlobalQuarantine) { for (scudo::uptr I = 0; I < NumberOfThreads; I++) pthread_join(T[I].Thread, 0); - scudo::ScopedString Str; - Quarantine.getStats(&Str); - Str.output(); + if (TEST_HAS_FAILURE) { + scudo::ScopedString Str; + Quarantine.getStats(&Str); + Str.output(); + } for (scudo::uptr I = 0; I < NumberOfThreads; I++) Quarantine.drainAndRecycle(&T[I].Cache, Cb); diff --git a/compiler-rt/lib/scudo/standalone/tests/size_class_map_test.cpp b/compiler-rt/lib/scudo/standalone/tests/size_class_map_test.cpp index 05b5835ff0bb6..73b2823e4c9d1 100644 --- a/compiler-rt/lib/scudo/standalone/tests/size_class_map_test.cpp +++ b/compiler-rt/lib/scudo/standalone/tests/size_class_map_test.cpp @@ -12,8 +12,10 @@ template void testSizeClassMap() { typedef SizeClassMap SCMap; - scudo::printMap(); scudo::validateMap(); + if (TEST_HAS_FAILURE) { + scudo::printMap(); + } } TEST(ScudoSizeClassMapTest, DefaultSizeClassMap) {