From patchwork Mon Jul 13 17:02:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 6780661 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1F5E29F380 for ; Mon, 13 Jul 2015 17:03:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C7BE20452 for ; Mon, 13 Jul 2015 17:03:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6565C204D1 for ; Mon, 13 Jul 2015 17:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751868AbbGMRDM (ORCPT ); Mon, 13 Jul 2015 13:03:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39403 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750792AbbGMRDL (ORCPT ); Mon, 13 Jul 2015 13:03:11 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 028FC91DDA for ; Mon, 13 Jul 2015 17:03:10 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-235.brq.redhat.com [10.34.1.235]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6DH36rU017201; Mon, 13 Jul 2015 13:03:09 -0400 From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, jen@redhat.com Subject: [kvm-unit-tests PATCH v2 2/6] run: check DRYRUN Date: Mon, 13 Jul 2015 19:02:59 +0200 Message-Id: <1436806983-29783-3-git-send-email-drjones@redhat.com> In-Reply-To: <1436806983-29783-1-git-send-email-drjones@redhat.com> References: <1436806983-29783-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Only execute the test if DRYRUN isn't set to yes. This is used by mkstandalone.sh Signed-off-by: Andrew Jones --- arm/run | 12 +++++++----- x86/run | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/arm/run b/arm/run index 662a8564674a3..8cc2fa2571967 100755 --- a/arm/run +++ b/arm/run @@ -44,9 +44,11 @@ fi command="$qemu $M -cpu $processor $chr_testdev" command+=" -display none -serial stdio -kernel" - echo $command "$@" -$command "$@" -ret=$? -echo Return value from qemu: $ret -exit $ret + +if [ "$DRYRUN" != "yes" ]; then + $command "$@" + ret=$? + echo Return value from qemu: $ret + exit $ret +fi diff --git a/x86/run b/x86/run index 5281fca2125d8..b4a35b2332846 100755 --- a/x86/run +++ b/x86/run @@ -44,7 +44,10 @@ fi command="${qemu} -enable-kvm $pc_testdev -vnc none -serial stdio $pci_testdev -kernel" echo ${command} "$@" -${command} "$@" -ret=$? -echo Return value from qemu: $ret -exit $ret + +if [ "$DRYRUN" != "yes" ]; then + ${command} "$@" + ret=$? + echo Return value from qemu: $ret + exit $ret +fi