From c2c026e84376e8e65d7af84b9df33071c0511d1d Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 18 Mar 2016 08:28:21 -0700
Subject: [PATCH] Renames
---
templates/tools/dockerfile/clang_update.include | 2 +-
.../Dockerfile.template} | 14 +++++---------
tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 2 +-
.../json_fuzzer_test => fuzzer}/Dockerfile | 2 +-
tools/fuzzer/build_and_run_fuzzer.sh | 3 ---
tools/jenkins/run_fuzzer.sh | 2 +-
6 files changed, 9 insertions(+), 16 deletions(-)
rename templates/tools/dockerfile/test/{fuzzers.template => fuzzer/Dockerfile.template} (86%)
rename tools/dockerfile/test/{fuzzers/json_fuzzer_test => fuzzer}/Dockerfile (98%)
diff --git a/templates/tools/dockerfile/clang_update.include b/templates/tools/dockerfile/clang_update.include
index a44fe717d8..4f827c8dc2 100644
--- a/templates/tools/dockerfile/clang_update.include
+++ b/templates/tools/dockerfile/clang_update.include
@@ -1,5 +1,5 @@
#=================
-# 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/templates/tools/dockerfile/test/fuzzers.template b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template
similarity index 86%
rename from templates/tools/dockerfile/test/fuzzers.template
rename to templates/tools/dockerfile/test/fuzzer/Dockerfile.template
index 6cf8694f3b..479be0556a 100644
--- a/templates/tools/dockerfile/test/fuzzers.template
+++ b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template
@@ -1,9 +1,5 @@
%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
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
similarity index 98%
rename from tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile
rename to 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 \
--
GitLab