diff options
| author |  Nick Terrell <nickrterrell@gmail.com> | 2019-04-17 21:42:41 -0700 |
|---|---|---|
| committer |  Max Moroz <dor3s1@gmail.com> | 2019-04-17 21:42:41 -0700 |
| commit | fb7075b1edeb00a5cf5f9c5833cd75d75864e23d (patch) | |
| tree | e42ff674893a84b21683b01e9ffe3d22ec4aa2f8 | |
| parent | 7bdfb2b7d82bd7b9166969688894791e79065588 (diff) | |
[zstd] Move downloading seed corpora to build.sh (#2331)
I just added a new fuzzer, `zstd_frame_info`, and want to be able to add new
fuzzers without submitting a pull request to oss-fuzz. This change uses zstd's
Makefile to download the corpora. Now I can add a new fuzzer to zstd and it will
automatically get built and download the seed corpus in oss-fuzz.
| -rw-r--r-- | projects/zstd/Dockerfile | 12 | ||||
| -rwxr-xr-x | projects/zstd/build.sh | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/projects/zstd/Dockerfile b/projects/zstd/Dockerfile index 3f0a448a..5e41221a 100644 --- a/projects/zstd/Dockerfile +++ b/projects/zstd/Dockerfile @@ -16,17 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER nickrterrell@gmail.com -RUN apt-get update && apt-get install -y make python -# Add corpora -ADD https://github.com/facebook/zstd/releases/download/fuzz-corpora/block_decompress_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/block_round_trip_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/simple_decompress_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/simple_round_trip_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/stream_decompress_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/stream_round_trip_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/dictionary_decompress_seed_corpus.zip \ - https://github.com/facebook/zstd/releases/download/fuzz-corpora/dictionary_round_trip_seed_corpus.zip \ - $SRC/ +RUN apt-get update && apt-get install -y make python wget # Clone source RUN git clone --depth 1 https://github.com/facebook/zstd WORKDIR zstd diff --git a/projects/zstd/build.sh b/projects/zstd/build.sh index 28d37d66..5e0955d3 100755 --- a/projects/zstd/build.sh +++ b/projects/zstd/build.sh @@ -18,6 +18,9 @@ cd tests/fuzz +# Download the seed corpora +make -j seedcorpora +# Build all of the fuzzers ./fuzz.py build all for target in $(./fuzz.py list); do @@ -33,5 +36,5 @@ for target in $(./fuzz.py list); do cp "$target.dict" "$OUT" fi - cp "$SRC/${target}_seed_corpus.zip" "$OUT" + cp "corpora/${target}_seed_corpus.zip" "$OUT" done |