diff options
author | Paul Dreik <github@pauldreik.se> | 2019-11-06 15:44:23 +0100 |
---|---|---|
committer | Abhishek Arya <inferno@chromium.org> | 2019-11-06 06:44:23 -0800 |
commit | 12b7ac580ff857e9a75bfdc6998fa2f9621aae51 (patch) | |
tree | 59cf2c1c5812cfd9707fcdc39db12b3ec41cd3ba | |
parent | 4ab29a23696b7a7a55cef0bb73180043ed9ca922 (diff) |
[simdjson] move the build script into the simdjson repo (#3013)
this means it can be maintained and bugfixed upstream
-rw-r--r-- | projects/simdjson/Dockerfile | 2 | ||||
-rwxr-xr-x | projects/simdjson/build.sh | 24 |
2 files changed, 2 insertions, 24 deletions
diff --git a/projects/simdjson/Dockerfile b/projects/simdjson/Dockerfile index a017a907..21e332fb 100644 --- a/projects/simdjson/Dockerfile +++ b/projects/simdjson/Dockerfile @@ -26,7 +26,7 @@ RUN wget --quiet https://github.com/Kitware/CMake/releases/download/v${CMAKEVER} ./cmake-${CMAKEVER}-Linux-x86_64.sh --skip-license --prefix="/usr/local" # point to https://github.com/lemire/simdjson.git once integrated -RUN git clone --depth 1 --single-branch --branch paul/ossfuzz_step1 https://github.com/pauldreik/simdjson.git simdjson +RUN git clone --depth 1 --single-branch --branch paul/ossfuzz_step2 https://github.com/pauldreik/simdjson.git simdjson WORKDIR simdjson COPY build.sh $SRC/ diff --git a/projects/simdjson/build.sh b/projects/simdjson/build.sh index 3fd9730b..5d5e72b1 100755 --- a/projects/simdjson/build.sh +++ b/projects/simdjson/build.sh @@ -15,26 +15,4 @@ # ################################################################################ -# build the corpus (all inputs are json, the same corpus can be used for everyone) -fuzz/build_corpus.sh - -mkdir build -cd build - -cmake .. \ --GNinja \ --DCMAKE_BUILD_TYPE=Debug \ --DSIMDJSON_BUILD_STATIC=On \ --DENABLE_FUZZING=On \ --DSIMDJSON_FUZZ_LINKMAIN=Off \ --DSIMDJSON_FUZZ_LDFLAGS=$LIB_FUZZING_ENGINE - -cmake --build . - -cp fuzz/fuzz_* $OUT - -# all corpora are equal, they all take json as input -for f in $OUT/fuzz* ; do - cp ../corpus.zip $(basename $f).zip -done - +fuzz/ossfuzz.sh |