Merge

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"

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"

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"

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"

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"