diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-04 14:15:15 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-04 14:15:15 -0700 |
| commit | 128c39e21af84861e0f791ae03146b403bce7bfb (patch) | |
| tree | c0f213cca1d1920e65f2e243fdd34cdd92a0d1e3 /tools/fuzzer | |
| parent | f35e5f732da30476e55e64bfa5430884e9976d19 (diff) | |
Merge
Diffstat (limited to 'tools/fuzzer')
| -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/server_fuzzer.sh | 2 | ||||
| -rw-r--r-- | tools/fuzzer/runners/uri_fuzzer_test.sh | 4 |
5 files changed, 1 insertions, 17 deletions
diff --git a/tools/fuzzer/runners/hpack_parser_fuzzer_test.sh b/tools/fuzzer/runners/hpack_parser_fuzzer_test.sh index 8b198eb306..ebe09bc072 100644 --- a/tools/fuzzer/runners/hpack_parser_fuzzer_test.sh +++ b/tools/fuzzer/runners/hpack_parser_fuzzer_test.sh @@ -29,11 +29,7 @@ # 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 fff9421e3c..bb6dc95085 100644 --- a/tools/fuzzer/runners/http_fuzzer_test.sh +++ b/tools/fuzzer/runners/http_fuzzer_test.sh @@ -29,11 +29,7 @@ # 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 4460790848..303eb9fd00 100644 --- a/tools/fuzzer/runners/json_fuzzer_test.sh +++ b/tools/fuzzer/runners/json_fuzzer_test.sh @@ -29,11 +29,7 @@ # 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/server_fuzzer.sh b/tools/fuzzer/runners/server_fuzzer.sh index 90b2efe1bb..c905343243 100644 --- a/tools/fuzzer/runners/server_fuzzer.sh +++ b/tools/fuzzer/runners/server_fuzzer.sh @@ -29,7 +29,7 @@ # 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/runners/uri_fuzzer_test.sh b/tools/fuzzer/runners/uri_fuzzer_test.sh index 16c7c51591..2bdc949158 100644 --- a/tools/fuzzer/runners/uri_fuzzer_test.sh +++ b/tools/fuzzer/runners/uri_fuzzer_test.sh @@ -29,11 +29,7 @@ # 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" |