diff options
author | Mike Aizatsky <aizatsky@google.com> | 2016-10-07 11:13:42 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-14 15:06:50 -0700 |
commit | 5e0c12af838f7c0f0cd0793cd8e35ef981fbf97b (patch) | |
tree | 6d17a0b19b60a1c8fe5f049ca0c6db3e8c158048 /fuzz | |
parent | d0a96517e517e9a2f3012910ffa1300973616070 (diff) | |
download | tpm2-5e0c12af838f7c0f0cd0793cd8e35ef981fbf97b.tar.gz |
[oss-fuzz] updated Dockerfile to follow recent oss-fuzz infra changes
The build script location is now fixed to /src/build.sh
This frees our CMD usage and will allow additional features
(e.g. running a fuzzer with one command line).
BUG=none
BRANCH=none
TEST=follow instructions in fuzz/build.sh
Change-Id: Iff14e2a154cb7eaca66bdf5692f71f32453d9bd1
Reviewed-on: https://chromium-review.googlesource.com/398598
Commit-Ready: Mike Aizitsky <aizatsky@chromium.org>
Tested-by: Mike Aizitsky <aizatsky@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Nagendra Modadugu <ngm@google.com>
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Diffstat (limited to 'fuzz')
-rw-r--r-- | fuzz/Dockerfile | 3 | ||||
-rwxr-xr-x | fuzz/build.sh (renamed from fuzz/build-fuzzers.sh) | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fuzz/Dockerfile b/fuzz/Dockerfile index f6dbefe..67aea85 100644 --- a/fuzz/Dockerfile +++ b/fuzz/Dockerfile @@ -6,4 +6,5 @@ # FROM ossfuzz/base-libfuzzer RUN apt-get install -y make libssl-dev binutils libgcc-5-dev -CMD /src/tpm2/fuzz/build-fuzzers.sh +ENV GIT_URL="https://chromium.googlesource.com/chromiumos/third_party/tpm2/" +COPY fuzz/build.sh /src/ diff --git a/fuzz/build-fuzzers.sh b/fuzz/build.sh index 3a2ab42..ae6ba1a 100755 --- a/fuzz/build-fuzzers.sh +++ b/fuzz/build.sh @@ -13,7 +13,7 @@ make V=1 obj=/work/tpm2 /work/tpm2/libtpm2.a find /usr/lib -name "*.a" grep -r BN_CTX_get /usr/lib/ -$CXX $CXXFLAGS $LDFLAGS -std=c++11 \ +$CXX $CXXFLAGS $FUZZER_LDFLAGS -std=c++11 \ /src/tpm2/fuzz/execute-command.cc -o /out/tpm2_execute_command_fuzzer \ /work/libfuzzer/*.o /work/tpm2/libtpm2.a \ /usr/lib/x86_64-linux-gnu/libcrypto.a /usr/lib/x86_64-linux-gnu/libssl.a \ |