Merge branch 'fuzzer-polish' of github.com:nicolasnoble/grpc into e2e…

…fuzz
samanalysis · Apr 4, 2016 · f35e5f7 · f35e5f7
2 parents 49fe21c + 762a8df
commit f35e5f7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/templates/tools/fuzzer/runners.template b/templates/tools/fuzzer/runners.template
@@ -35,7 +35,7 @@ template: |
   # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   #
 
-  flags="-max_total_time=300"
+  flags="-max_total_time=3600 -jobs=3 -workers=3 -artifact_prefix=fuzzer_output/"
   if [ "$config" == "asan-trace-cmp" ]
   then
     flags="-use_traces=1 $flags"

diff --git a/tools/fuzzer/build_and_run_fuzzer.sh b/tools/fuzzer/build_and_run_fuzzer.sh
@@ -34,4 +34,5 @@ set -ex
 cd $(dirname $0)/../..
 make CONFIG=$config $1 -j3
 mkdir -p fuzzer_output
+export ASAN_OPTIONS=handle_abort=1
 . tools/fuzzer/runners/$1.sh
diff --git a/tools/fuzzer/runners/hpack_parser_fuzzer_test.sh b/tools/fuzzer/runners/hpack_parser_fuzzer_test.sh
@@ -29,7 +29,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+<<<<<<< HEAD
 flags="-max_total_time=300"
+=======
+flags="-max_total_time=3600 -jobs=3 -workers=3 -artifact_prefix=fuzzer_output/"
+>>>>>>> 762a8df773a0d2289cac11522bc852972821a78b
 if [ "$config" == "asan-trace-cmp" ]
 then
   flags="-use_traces=1 $flags"

diff --git a/tools/fuzzer/runners/http_fuzzer_test.sh b/tools/fuzzer/runners/http_fuzzer_test.sh
@@ -29,7 +29,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+<<<<<<< HEAD
 flags="-max_total_time=300"
+=======
+flags="-max_total_time=3600 -jobs=3 -workers=3 -artifact_prefix=fuzzer_output/"
+>>>>>>> 762a8df773a0d2289cac11522bc852972821a78b
 if [ "$config" == "asan-trace-cmp" ]
 then
   flags="-use_traces=1 $flags"

diff --git a/tools/fuzzer/runners/json_fuzzer_test.sh b/tools/fuzzer/runners/json_fuzzer_test.sh
@@ -29,7 +29,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+<<<<<<< HEAD
 flags="-max_total_time=300"
+=======
+flags="-max_total_time=3600 -jobs=3 -workers=3 -artifact_prefix=fuzzer_output/"
+>>>>>>> 762a8df773a0d2289cac11522bc852972821a78b
 if [ "$config" == "asan-trace-cmp" ]
 then
   flags="-use_traces=1 $flags"

diff --git a/tools/fuzzer/runners/uri_fuzzer_test.sh b/tools/fuzzer/runners/uri_fuzzer_test.sh
@@ -29,7 +29,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+<<<<<<< HEAD
 flags="-max_total_time=300"
+=======
+flags="-max_total_time=3600 -jobs=3 -workers=3 -artifact_prefix=fuzzer_output/"
+>>>>>>> 762a8df773a0d2289cac11522bc852972821a78b
 if [ "$config" == "asan-trace-cmp" ]
 then
   flags="-use_traces=1 $flags"