Roll abseil_revision 8028a87c96..011aeedefe
Change Log:
https://chromium.googlesource.com/external/github.com/abseil/abseil-cpp/+log/8028a87c96..011aeedefe
Full diff:
https://chromium.googlesource.com/external/github.com/abseil/abseil-cpp/+/8028a87c96..011aeedefe
This CL includes a roll of //third_party/fuzztest [1] to avoid an
incompatible state between FuzzTest's absl requirements and the
Chromium's absl version.
[1] - https://chromium-review.googlesource.com/c/chromium/src/+/5116482
Bug: None
Change-Id: Ie24622c0a4fe1822fc288aefa2647ba35fb3c2e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5115239
Reviewed-by: Adrian Taylor <adetaylor@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1237630}
NOKEYCHECK=True
GitOrigin-RevId: 8306c78aa859df38ba56db6710357172a0f63fac
diff --git a/BUILD.gn b/BUILD.gn
index 2a8495f..7ca7bda 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -30,10 +30,15 @@
cflags += [ "-msse4.2" ]
}
include_dirs = [ "src" ]
+
+ # Riegeli is a library which centipede can use to store data more
+ # efficiently. It's not yet available in Chromium, so disable
+ # for now.
+ defines = [ "CENTIPEDE_DISABLE_RIEGELI" ]
if (use_centipede) {
- defines = [ "FUZZTEST_USE_CENTIPEDE" ]
+ defines += [ "FUZZTEST_USE_CENTIPEDE" ]
} else if (use_fuzzing_engine && fuzzing_engine_supports_custom_main) {
- defines = [ "FUZZTEST_COMPATIBILITY_MODE" ]
+ defines += [ "FUZZTEST_COMPATIBILITY_MODE" ]
}
}
@@ -51,8 +56,11 @@
"src/centipede/feature.h",
"src/centipede/knobs.cc",
"src/centipede/knobs.h",
+ "src/centipede/logging.h",
"src/centipede/pc_info.cc",
"src/centipede/pc_info.h",
+ "src/centipede/remote_file.cc",
+ "src/centipede/remote_file.h",
"src/centipede/reverse_pc_table.h",
"src/centipede/runner_cmp_trace.h",
"src/centipede/runner_request.cc",
@@ -150,6 +158,8 @@
"src/centipede/coverage.cc",
"src/centipede/distill.cc",
"src/centipede/distill.h",
+ "src/centipede/early_exit.cc",
+ "src/centipede/early_exit.h",
"src/centipede/environment.cc",
"src/centipede/environment_flags.cc",
"src/centipede/environment_flags.h",
@@ -158,10 +168,7 @@
"src/centipede/fuzztest_mutator.cc",
"src/centipede/fuzztest_mutator.h",
"src/centipede/hash.cc",
- "src/centipede/logging.cc",
- "src/centipede/logging.h",
"src/centipede/minimize_crash.cc",
- "src/centipede/remote_file.cc",
"src/centipede/rusage_profiler.cc",
"src/centipede/rusage_stats.cc",
"src/centipede/shard_reader.cc",
@@ -199,8 +206,6 @@
"src/fuzztest/fuzztest.cc",
"src/fuzztest/fuzztest.h",
"src/fuzztest/googletest_fixture_adapter.h",
- "src/fuzztest/init_fuzztest.cc",
- "src/fuzztest/init_fuzztest.h",
"src/fuzztest/internal/any.h",
"src/fuzztest/internal/centipede_adaptor.h",
"src/fuzztest/internal/compatibility_mode.cc",
@@ -304,14 +309,22 @@
# # out of process execution environment.
# # Requires use_centipede gn argument.
source_set("fuzztest") {
+ sources = [
+ "src/fuzztest/init_fuzztest.cc",
+ "src/fuzztest/init_fuzztest.h",
+ ]
+ deps = [
+ "//testing/gtest",
+ "//third_party/abseil-cpp/absl/flags:flag",
+ ]
if (use_centipede) {
# If we are building for centipede, we want to make fuzztest executables
# which can be used as centipede fuzzers.
- sources = [ "src/fuzztest/internal/centipede_adaptor.cc" ]
- deps = [ ":centipede_runner_no_main" ]
+ sources += [ "src/fuzztest/internal/centipede_adaptor.cc" ]
+ deps += [ ":centipede_runner_no_main" ]
} else if (use_fuzzing_engine && fuzzing_engine_supports_custom_main) {
# Typically, libfuzzer.
- deps = [ "//testing/libfuzzer:fuzzing_engine_no_main" ]
+ deps += [ "//testing/libfuzzer:fuzzing_engine_no_main" ]
}
public_deps = [ ":fuzztest_internal" ]
public_configs = [ ":fuzztest_internal_config" ]
