Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

infra: Bump fuzztest / Centipede #12029

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions infra/base-images/base-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ RUN precompile_honggfuzz
RUN cd $SRC && \
git clone https://github.com/google/fuzztest && \
cd fuzztest && \
git checkout a37d133f714395cabc20dd930969a889495c9f53 && \
git checkout fd280e8e93064a8c0263d232743e1e70542b0b5e && \
rm -rf .git

ENV CENTIPEDE_BIN_DIR=$SRC/fuzztest/bazel-bin
Expand Down Expand Up @@ -177,4 +177,4 @@ COPY llvmsymbol.diff $SRC
COPY detect_repo.py /opt/cifuzz/
COPY bazel.bazelrc /root/.bazelrc

CMD ["compile"]
CMD ["compile"]
31 changes: 31 additions & 0 deletions infra/base-images/base-builder/precompile_centipede
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,37 @@
echo -n "Precompiling centipede"

# Build Centipede with bazel.

cd "$SRC/fuzztest/"
patch_build=$(cat << 'EOF'
diff --git a/centipede/BUILD b/centipede/BUILD
index 2000e02..e1301b1 100644
--- a/centipede/BUILD
+++ b/centipede/BUILD
@@ -17,7 +17,6 @@

load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
load("@rules_proto//proto:defs.bzl", "proto_library")
-load(":instrument.bzl", "cc_uninstrumented_binary")

VISIBILITY = ["//visibility:public"]

@@ -61,11 +60,6 @@ cc_binary(
],
)

-cc_uninstrumented_binary(
- name = "centipede_uninstrumented",
- binary = ":centipede",
- visibility = PUBLIC_API_VISIBILITY,
-)

# A standalone seed corpus generator.
cc_binary(
EOF
)
echo "$patch_build" | git apply

cd "$SRC/fuzztest/centipede/"
apt-get update && apt-get install libssl-dev -y
unset CXXFLAGS CFLAGS
Expand Down
Loading