diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-18 08:28:21 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-18 08:28:21 -0700 |
| commit | c2c026e84376e8e65d7af84b9df33071c0511d1d (patch) | |
| tree | c52a0251be96883db8fa17efb0c3a0d6b760fcd9 /tools | |
| parent | dc559c96979b45c8694586915fdecc7b0e21e51d (diff) | |
Renames
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 2 | ||||
| -rw-r--r-- | tools/dockerfile/test/fuzzer/Dockerfile (renamed from tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile) | 2 | ||||
| -rwxr-xr-x | tools/fuzzer/build_and_run_fuzzer.sh | 3 | ||||
| -rwxr-xr-x | tools/jenkins/run_fuzzer.sh | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 685d2038b0..6c7aece4ff 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -68,7 +68,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean #================= -# Update clang to a version with improved tsan +# Update clang to a version with improved tsan and fuzzing capabilities RUN apt-get update && apt-get -y install python cmake && apt-get clean diff --git a/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile b/tools/dockerfile/test/fuzzer/Dockerfile index 9335a2a97c..7b35c009e3 100644 --- a/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile +++ b/tools/dockerfile/test/fuzzer/Dockerfile @@ -68,7 +68,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean #================= -# Update clang to a version with improved tsan +# Update clang to a version with improved tsan and fuzzing capabilities RUN apt-get update && apt-get -y install python cmake && apt-get clean diff --git a/tools/fuzzer/build_and_run_fuzzer.sh b/tools/fuzzer/build_and_run_fuzzer.sh index 6b63ef02ca..a2108988d8 100755 --- a/tools/fuzzer/build_and_run_fuzzer.sh +++ b/tools/fuzzer/build_and_run_fuzzer.sh @@ -31,8 +31,5 @@ set -ex -git submodule update --init -find . | sort -make CONFIG=$config run_dep_checks make CONFIG=$config $1 bins/$config/$1 diff --git a/tools/jenkins/run_fuzzer.sh b/tools/jenkins/run_fuzzer.sh index f2423c40ff..94ee493700 100755 --- a/tools/jenkins/run_fuzzer.sh +++ b/tools/jenkins/run_fuzzer.sh @@ -34,7 +34,7 @@ set -ex export RUN_COMMAND="tools/fuzzer/build_and_run_fuzzer.sh $1" export DOCKER_RUN_SCRIPT=tools/jenkins/docker_run.sh -export DOCKERFILE_DIR=tools/dockerfile/test/fuzzers/$1 +export DOCKERFILE_DIR=tools/dockerfile/test/fuzzer export OUTPUT_DIR= tools/jenkins/build_and_run_docker.sh \ |