A few more LOG macro cleanup.

PiperOrigin-RevId: 797932466

Author: lszekeres

centipede/BUILD

@@ -281,7 +281,6 @@ cc_library(
     deps = [
         "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/functional:any_invocable",
-        "@abseil-cpp//absl/log:check",
         "@abseil-cpp//absl/synchronization",
         "@com_google_fuzztest//common:logging",
     ],
@@ -1865,7 +1864,7 @@ cc_test(
     srcs = ["crash_summary_test.cc"],
     deps = [
         ":crash_summary",
-        "@abseil-cpp//absl/log:check",
+        "@com_google_fuzztest//common:logging",
         "@googletest//:gtest_main",
     ],
 )

centipede/crash_summary_test.cc

@@ -19,7 +19,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "absl/log/check.h"
+#include "./common/logging.h"
 
 namespace fuzztest::internal {
 namespace {
@@ -39,7 +39,7 @@ class CrashSummaryTest : public testing::Test {
 
  protected:
   static void DumpCrashSummary(const CrashSummary& summary) {
-    CHECK(dumped_summary_ == nullptr);
+    FUZZTEST_CHECK(dumped_summary_ == nullptr);
     dumped_summary_ = new CrashSummary{summary};
   };
 

centipede/tools/BUILD

@@ -24,13 +24,12 @@ cc_binary(
     deps = [
         "@abseil-cpp//absl/flags:flag",
         "@abseil-cpp//absl/flags:parse",
-        "@abseil-cpp//absl/log",
-        "@abseil-cpp//absl/log:check",
         "@abseil-cpp//absl/status",
         "@abseil-cpp//absl/status:statusor",
         "@com_google_fuzztest//centipede:feature",
         "@com_google_fuzztest//centipede:util",
         "@com_google_fuzztest//common:blob_file",
         "@com_google_fuzztest//common:defs",
+        "@com_google_fuzztest//common:logging",
     ],
 )

centipede/tools/feature_analyzer.cc

@@ -26,14 +26,13 @@
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "./centipede/feature.h"
 #include "./centipede/util.h"
 #include "./common/blob_file.h"
 #include "./common/defs.h"
+#include "./common/logging.h"
 
 ABSL_FLAG(std::string, feature_file, "", "Path to the feature file to read");
 
@@ -63,7 +62,7 @@ absl::StatusOr<FeatureVec> ReadFeaturesFile(absl::string_view features_path) {
 
 absl::Status FeatureAnalyzerMain() {
   size_t user_domain = absl::GetFlag(FLAGS_user_domain);
-  CHECK_LT(user_domain, feature_domains::kUserDomains.size());
+  FUZZTEST_CHECK_LT(user_domain, feature_domains::kUserDomains.size());
   size_t goal_domain = feature_domains::kUserDomains[user_domain].domain_id();
 
   absl::StatusOr<FeatureVec> features_or =

e2e_tests/testdata/BUILD

@@ -105,7 +105,6 @@ cc_binary(
         "@com_google_fuzztest//fuzztest:flatbuffers",
         "@com_google_fuzztest//fuzztest:fuzztest_gtest_main",
         "@com_google_fuzztest//fuzztest:googletest_fixture_adapter",
-        "@com_google_fuzztest//fuzztest/internal:logging",
         "@com_google_fuzztest//fuzztest/internal:test_flatbuffers_cc_fbs",
         "@com_google_fuzztest//fuzztest/internal:test_protobuf_cc_proto",
         "@protobuf",

e2e_tests/testdata/CMakeLists.txt

@@ -41,7 +41,7 @@ target_link_libraries(
   re2::re2
   fuzztest_flatbuffers
   fuzztest_googletest_fixture_adapter
-  fuzztest_logging
+  fuzztest_common_logging
   fuzztest_test_flatbuffers_headers
 )
 link_fuzztest(fuzz_tests_for_functional_testing.stripped)

e2e_tests/testdata/fuzz_tests_for_functional_testing.cc

@@ -16,7 +16,6 @@
 //
 // Specifically, used by `functional_test` only.
 
-#include <cerrno>
 #include <csignal>
 #include <cstdint>
 #include <cstdio>
@@ -40,7 +39,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "./common/logging.h"
-#include "./fuzztest/internal/logging.h"
 #include "./fuzztest/internal/test_flatbuffers_generated.h"
 #include "./fuzztest/internal/test_protobuf.pb.h"
 #include "google/protobuf/descriptor.h"
@@ -798,11 +796,11 @@ class AlternateSignalStackFixture {
     // where the callbacks from the signal handler happen in a separate stack.
     new_sigact.sa_flags = SA_SIGINFO | SA_ONSTACK;
 
-    FUZZTEST_CHECK(sigaction(SIGUSR1, &new_sigact, nullptr) == 0) << errno;
+    FUZZTEST_PCHECK(sigaction(SIGUSR1, &new_sigact, nullptr) == 0);
     stack_t test_stack = {};
     test_stack.ss_size = 1 << 20;
     test_stack.ss_sp = malloc(test_stack.ss_size);
-    FUZZTEST_CHECK(sigaltstack(&test_stack, &old_stack) == 0) << errno;
+    FUZZTEST_PCHECK(sigaltstack(&test_stack, &old_stack) == 0);
   }
 
   void StackCalculationWorksWithAlternateStackForSignalHandlers(int i) {
@@ -822,7 +820,7 @@ class AlternateSignalStackFixture {
   ~AlternateSignalStackFixture() {
     stack_t test_stack = {};
     // Resume to the old signal stack.
-    FUZZTEST_CHECK(sigaltstack(&old_stack, &test_stack) == 0) << errno;
+    FUZZTEST_PCHECK(sigaltstack(&old_stack, &test_stack) == 0);
     free(test_stack.ss_sp);
   }
 

fuzztest/BUILD

@@ -130,7 +130,6 @@ cc_library(
         "@com_google_fuzztest//fuzztest/internal:flag_name",
         "@com_google_fuzztest//fuzztest/internal:googletest_adaptor",
         "@com_google_fuzztest//fuzztest/internal:io",
-        "@com_google_fuzztest//fuzztest/internal:logging",
         "@com_google_fuzztest//fuzztest/internal:registry",
         "@com_google_fuzztest//fuzztest/internal:runtime",
         "@googletest//:gtest",

fuzztest/CMakeLists.txt

@@ -199,7 +199,6 @@ fuzztest_cc_library(
     fuzztest::flag_name
     fuzztest::googletest_adaptor
     fuzztest::io
-    fuzztest::logging
     fuzztest::registry
     fuzztest::runtime
     GTest::gtest

fuzztest/fuzztest_macros.cc

@@ -14,7 +14,6 @@
 
 #include "./fuzztest/fuzztest_macros.h"
 
-#include <cerrno>
 #include <cstring>
 #include <filesystem>  // NOLINT
 #include <fstream>