From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Subject: [kvm-unit-tests PATCH 3/6] arch-run: DRYRUN is no longer needed, kill it Date: Fri, 22 Jan 2016 15:58:26 +0100 Message-ID: <1453474709-10679-4-git-send-email-drjones@redhat.com> References: <1453474709-10679-1-git-send-email-drjones@redhat.com> Cc: pbonzini@redhat.com, rkrcmar@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59465 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753565AbcAVO6k (ORCPT ); Fri, 22 Jan 2016 09:58:40 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 8C75D19CF65 for ; Fri, 22 Jan 2016 14:58:40 +0000 (UTC) In-Reply-To: <1453474709-10679-1-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Andrew Jones --- arm/run | 31 +++++++++---------------------- x86/run | 10 ++++------ 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/arm/run b/arm/run index 0158ca5649a9f..654a17c8f69c2 100755 --- a/arm/run +++ b/arm/run @@ -17,32 +17,21 @@ if [ -c /dev/kvm ]; then fi fi -if [ "$ACCEL" = "kvm" ] && [ "$kvm_available" != "yes" ] && - [ "$DRYRUN" != "yes" ]; then - printf "skip $TESTNAME (kvm only)\n\n" +if [ "$ACCEL" = "kvm" ] && [ "$kvm_available" != "yes" ]; then + echo "skip $TESTNAME (kvm only)" exit 2 fi if [ -z "$ACCEL" ]; then - if [ "$DRYRUN" = "yes" ]; then - # Output kvm with tcg fallback for dryrun (when both are - # allowed), since the command line we output may get used - # elsewhere. - ACCEL="kvm:tcg" - elif [ "$kvm_available" = "yes" ]; then + if [ "$kvm_available" = "yes" ]; then ACCEL="kvm" else ACCEL="tcg" fi fi -if [ "$ARCH" = "arm64" ]; then - if [[ $ACCEL =~ kvm ]]; then - # arm64 must use '-cpu host' with kvm, and we can't use - # '-cpu host' with tcg, so we force kvm-only (no fallback) - ACCEL="kvm" - processor="host" - fi +if [ "$ARCH" = "arm64" ] && [ "$ACCEL" = "kvm" ]; then + processor="host" fi qemu="${QEMU:-qemu-system-$ARCH_NAME}" @@ -79,9 +68,7 @@ command="$qemu $M -cpu $processor $chr_testdev" command+=" -display none -serial stdio -kernel" echo $command "$@" -if [ "$DRYRUN" != "yes" ]; then - $command "$@" - ret=$? - echo Return value from qemu: $ret - exit $ret -fi +$command "$@" +ret=$? +echo Return value from qemu: $ret +exit $ret diff --git a/x86/run b/x86/run index 39a7cb92115cb..bdd7c7e394e45 100755 --- a/x86/run +++ b/x86/run @@ -45,9 +45,7 @@ fi command="${qemu} -enable-kvm $pc_testdev -vnc none -serial stdio $pci_testdev $hyperv_testdev -kernel" echo ${command} "$@" -if [ "$DRYRUN" != "yes" ]; then - ${command} "$@" - ret=$? - echo Return value from qemu: $ret - exit $ret -fi +${command} "$@" +ret=$? +echo Return value from qemu: $ret +exit $ret -- 2.4.3