aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/fuzzer
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-23 16:33:28 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-23 16:33:28 -0700
commit2123974071e502cde2dea3a457dccfe66af58bc1 (patch)
tree8b604b8ddd32f3d711ea154c0e1d6b3d7e392ff0 /tools/fuzzer
parent2a712736fe0d8611a8ea402f9fa3e893902bf864 (diff)
Merge fixes
Diffstat (limited to 'tools/fuzzer')
-rw-r--r--tools/fuzzer/runners/http_fuzzer_test.sh (renamed from tools/fuzzer/runners/http_request_fuzzer_test.sh)2
-rw-r--r--tools/fuzzer/runners/http_response_fuzzer_test.sh32
2 files changed, 1 insertions, 33 deletions
diff --git a/tools/fuzzer/runners/http_request_fuzzer_test.sh b/tools/fuzzer/runners/http_fuzzer_test.sh
index fbcd830379..afbc4f4c95 100644
--- a/tools/fuzzer/runners/http_request_fuzzer_test.sh
+++ b/tools/fuzzer/runners/http_fuzzer_test.sh
@@ -29,4 +29,4 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-bins/$config/http_request_fuzzer_test -max_total_time=60 fuzzer_output test/core/http/request_corpus
+bins/$config/http_fuzzer_test -max_total_time=60 fuzzer_output test/core/http/corpus
diff --git a/tools/fuzzer/runners/http_response_fuzzer_test.sh b/tools/fuzzer/runners/http_response_fuzzer_test.sh
deleted file mode 100644
index 8e3f494370..0000000000
--- a/tools/fuzzer/runners/http_response_fuzzer_test.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Copyright 2016, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-bins/$config/http_response_fuzzer_test -max_total_time=60 fuzzer_output test/core/http/response_corpus