diff options
Diffstat (limited to 'tools/fuzzer/runners/uri_fuzzer_test.sh')
| -rw-r--r-- | tools/fuzzer/runners/uri_fuzzer_test.sh | 4 |
1 files changed, 0 insertions, 4 deletions
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" |