From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Goldish Subject: [KVM-AUTOTEST PATCH] KVM test: make use of tcpdump optional Date: Mon, 17 May 2010 16:29:34 +0300 Message-ID: <1274102975-32453-2-git-send-email-mgoldish@redhat.com> References: <1274102975-32453-1-git-send-email-mgoldish@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: In-Reply-To: <1274102975-32453-1-git-send-email-mgoldish@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org To disable tcpdump, set 'run_tcpdump = no' in a config file. If 'run_tcpdump' isn't set at all, it defaults to 'yes'. (Currently TAP mode cannot be used without tcpdump.) Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_preprocessing.py | 2 +- client/tests/kvm/tests_base.cfg.sample | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py index 50db65c..e11207a 100644 --- a/client/tests/kvm/kvm_preprocessing.py +++ b/client/tests/kvm/kvm_preprocessing.py @@ -196,7 +196,7 @@ def preprocess(test, params, env): if "tcpdump" in env and not env["tcpdump"].is_alive(): env["tcpdump"].close() del env["tcpdump"] - if "tcpdump" not in env: + if "tcpdump" not in env and params.get("run_tcpdump", "yes") == "yes": command = "/usr/sbin/tcpdump -npvi any 'dst port 68'" logging.debug("Starting tcpdump (%s)...", command) env["tcpdump"] = kvm_subprocess.kvm_tail( diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index c9dfd0b..1276267 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -46,6 +46,7 @@ nic_mode = user #nic_mode = tap nic_script = scripts/qemu-ifup address_index = 0 +run_tcpdump = yes # Misc run_kvm_stat = yes -- 1.5.4.1