commit 822d1bb8e6a41ce34f672b9128a0c9607017731f
author Filip Niksic <fniksic@google.com> Fri Feb 24 15:05:01 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Feb 24 15:12:20 2023 -0800
tree c4141fe62ba707e06647e02bf6756deffa031432
parent 1497ac96081f9d151fb18e2e94e38113887c8798

Internal change

PiperOrigin-RevId: 512172973

e2e_tests/benchmark_test.cc

diff --git a/e2e_tests/benchmark_test.cc b/e2e_tests/benchmark_test.cc
index e04a5c3..12c1560 100644
--- a/e2e_tests/benchmark_test.cc
+++ b/e2e_tests/benchmark_test.cc
@@ -23,10 +23,13 @@
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 #include "absl/time/time.h"
 #include "./fuzztest/internal/logging.h"
 #include "./fuzztest/internal/subprocess.h"
@@ -155,8 +158,16 @@
   // Get the list of fuzz tests in the `microbenchmarks` binary.
   auto [status, std_out, std_err] = fuzztest::internal::RunCommand(
       {MicrobenchmarksBinaryPath(), "--list_fuzz_tests"});
-  const std::vector<std::string> fuzz_test_names =
+  const std::vector<std::string> std_out_lines =
       absl::StrSplit(std_out, '\n', absl::SkipWhitespace());
+  std::vector<std::string> fuzz_test_names;
+  fuzz_test_names.reserve(std_out_lines.size());
+  for (absl::string_view line : std_out_lines) {
+    static constexpr absl::string_view kFuzzTestPrefix = "[*] Fuzz test: ";
+    if (absl::ConsumePrefix(&line, kFuzzTestPrefix)) {
+      fuzz_test_names.push_back(std::string(line));
+    }
+  }
 
   if (list_tests) {
     for (const std::string& name : fuzz_test_names) {

e2e_tests/functional_test.cc

diff --git a/e2e_tests/functional_test.cc b/e2e_tests/functional_test.cc
index 3141fb5..251cf7b 100644
--- a/e2e_tests/functional_test.cc
+++ b/e2e_tests/functional_test.cc
@@ -135,9 +135,10 @@
 
 TEST(UnitTestModeTest, FuzzTestsAreFoundInTheBinary) {
   auto [status, std_out, std_err] = RunWith("--list_fuzz_tests");
-  EXPECT_THAT(std_out, HasSubstr("MySuite.Coverage"));
-  EXPECT_THAT(std_out, HasSubstr("MySuite.DivByZero"));
-  EXPECT_THAT(std_out, HasSubstr("MySuite.PassesWithPositiveInput"));
+  EXPECT_THAT(std_out, HasSubstr("[*] Fuzz test: MySuite.Coverage"));
+  EXPECT_THAT(std_out, HasSubstr("[*] Fuzz test: MySuite.DivByZero"));
+  EXPECT_THAT(std_out,
+              HasSubstr("[*] Fuzz test: MySuite.PassesWithPositiveInput"));
   EXPECT_THAT(status, Eq(ExitCode(0)));
 }
 

fuzztest/fuzztest_gtest_main.cc

diff --git a/fuzztest/fuzztest_gtest_main.cc b/fuzztest/fuzztest_gtest_main.cc
index 984bac4..600ccbb 100644
--- a/fuzztest/fuzztest_gtest_main.cc
+++ b/fuzztest/fuzztest_gtest_main.cc
@@ -46,7 +46,7 @@
 
   if (absl::GetFlag(FLAGS_list_fuzz_tests)) {
     for (const auto& name : fuzztest::ListRegisteredTests()) {
-      std::cout << name << '\n';
+      std::cout << "[*] Fuzz test: " << name << '\n';
     }
     return 0;
   }