commit f68e2e128c0411b9edba15392fc458e44487a6d7
author László Szekeres <lszekeres@google.com> Fri Feb 03 07:44:52 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Feb 03 07:45:19 2023 -0800
tree f9cd5cc1081077ead7b5dfe5ef206cf6b78c75b7
parent 63fe59ba2ff464e2597cc5fcc9649a41ccae875f

Fix compatibility mode.

PiperOrigin-RevId: 506900511

fuzztest/internal/compatibility_mode.cc

diff --git a/fuzztest/internal/compatibility_mode.cc b/fuzztest/internal/compatibility_mode.cc
index a76d82f..8566a2b 100644
--- a/fuzztest/internal/compatibility_mode.cc
+++ b/fuzztest/internal/compatibility_mode.cc
@@ -75,9 +75,9 @@
       GetExternalEngineCallback() == nullptr,
       "External engine callback is already set while running a fuzz test.");
   SetExternalEngineCallback(this);
-  run_mode = RunMode::kFuzz;
+  runtime_.SetRunMode(RunMode::kFuzz);
   auto& impl = GetFuzzerImpl();
-  on_failure.Enable(&impl.stats_, [] { return absl::Now(); });
+  runtime_.EnableReporter(&impl.stats_, [] { return absl::Now(); });
 
   FUZZTEST_INTERNAL_CHECK(impl.fixture_driver_ != nullptr,
                           "Invalid fixture driver!");
@@ -109,11 +109,11 @@
     FUZZTEST_INTERNAL_CHECK(impl.fixture_driver_ != nullptr,
                             "Invalid fixture driver!");
     impl.fixture_driver_->TearDownFuzzTest();
-    on_failure.PrintFinalStatsOnDefaultSink();
+    runtime_.PrintFinalStatsOnDefaultSink();
     // Use _Exit instead of exit so libFuzzer does not treat it as a crash.
     std::_Exit(0);
   }
-  on_failure.SetCurrentTest(&impl.test_);
+  runtime_.SetCurrentTest(&impl.test_);
   if (auto input = impl.TryParse(data)) {
     impl.RunOneInput({*std::move(input)});
   }

fuzztest/internal/compatibility_mode.h

diff --git a/fuzztest/internal/compatibility_mode.h b/fuzztest/internal/compatibility_mode.h
index b3edd9e..e2d0ba7 100644
--- a/fuzztest/internal/compatibility_mode.h
+++ b/fuzztest/internal/compatibility_mode.h
@@ -95,6 +95,8 @@
   // nullptr.
   std::unique_ptr<Driver> fixture_driver_staging_;
   std::unique_ptr<FuzzerImpl> fuzzer_impl_;
+
+  Runtime& runtime_ = Runtime::instance();
 };
 
 #endif  // FUZZTEST_COMPATIBILITY_MODE