diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-04 14:14:47 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-04 14:14:47 -0700 |
| commit | f35e5f732da30476e55e64bfa5430884e9976d19 (patch) | |
| tree | f000a534b5f12ae7714956fe10fda726f47c9b28 /tools/fuzzer | |
| parent | 49fe21c23eeaa6f9df2c0296813860d612f4c2fe (diff) | |
| parent | 762a8df773a0d2289cac11522bc852972821a78b (diff) | |
Merge branch 'fuzzer-polish' of github.com:nicolasnoble/grpc into e2efuzz
Diffstat (limited to 'tools/fuzzer')
| -rwxr-xr-x | tools/fuzzer/build_and_run_fuzzer.sh | 1 | ||||
| -rw-r--r-- | tools/fuzzer/runners/hpack_parser_fuzzer_test.sh | 4 | ||||
| -rw-r--r-- | tools/fuzzer/runners/http_fuzzer_test.sh | 4 | ||||
| -rw-r--r-- | tools/fuzzer/runners/json_fuzzer_test.sh | 4 | ||||
| -rw-r--r-- | tools/fuzzer/runners/uri_fuzzer_test.sh | 4 |
5 files changed, 17 insertions, 0 deletions
diff --git a/tools/fuzzer/build_and_run_fuzzer.sh b/tools/fuzzer/build_and_run_fuzzer.sh index bbe68884ad..7139097e3e 100755 --- 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 index 19ba987752..8b198eb306 100644 --- 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 index 96f7b08f6d..fff9421e3c 100644 --- 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 index 1c400743d3..4460790848 100644 --- 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 index 15e2a92d72..16c7c51591 100644 --- 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" |