Renames

templates/tools/dockerfile/clang_update.include

 #=================
-# 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
 

templates/tools/dockerfile/test/fuzzers.template → templates/tools/dockerfile/test/fuzzer/Dockerfile.template

 %YAML 1.2
----
-foreach: targets
-output_name: ${selected.name}/Dockerfile
-cond: selected.build == 'fuzzer'
-template: |
+--- |
   # Copyright 2015-2016, Google Inc.
   # All rights reserved.
   #
@@ -35,10 +31,10 @@ template: |
 
   FROM debian:jessie
 
-  <%include file="../apt_get_basic.include"/>
-  <%include file="../cxx_deps.include"/>
-  <%include file="../clang_update.include"/>
-  <%include file="../run_tests_addons.include"/>
+  <%include file="../../apt_get_basic.include"/>
+  <%include file="../../cxx_deps.include"/>
+  <%include file="../../clang_update.include"/>
+  <%include file="../../run_tests_addons.include"/>
   RUN clang++ -c -g -O2 -std=c++11 llvm/lib/Fuzzer/*.cpp -IFuzzer
   RUN ar ruv libFuzzer.a Fuzzer*.o
   RUN mv libFuzzer.a /usr/lib

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
 

tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile → 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
 

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

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 \