From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bandan Das Subject: [PATCH kvm-unit-tests] x86/run: Rearrange the valid binary and testdev support checks Date: Fri, 10 Apr 2015 10:57:01 -0400 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Cc: Paolo Bonzini To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:43991 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933567AbbDJO5C (ORCPT ); Fri, 10 Apr 2015 10:57:02 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3AEv2Zc001042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 10 Apr 2015 10:57:02 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This extends the sanity checks done on known common Qemu binary paths when the user supplies a QEMU= on the command line Fixes: b895b967db94937d5b593c51b95eb32d2889a764 Signed-off-by: Bandan Das --- x86/run | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/x86/run b/x86/run index 219a93b..5281fca 100755 --- a/x86/run +++ b/x86/run @@ -2,33 +2,28 @@ NOTFOUND=1 TESTDEVNOTSUPP=2 -qemukvm="${QEMU:-qemu-kvm}" -qemusystem="${QEMU:-qemu-system-x86_64}" +qemubinarysearch="${QEMU:-qemu-kvm qemu-system-x86_64}" -if ! [ -z "${QEMU}" ] -then - qemu="${QEMU}" -else - for qemucmds in ${qemukvm} ${qemusystem} - do - unset QEMUFOUND - unset qemu - if ! [ -z "${QEMUFOUND=$(${qemucmds} --help 2>/dev/null | grep "QEMU")}" ] && - ${qemucmds} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null; - then - qemu="${qemucmds}" - break - fi - done - if [ -z "${QEMUFOUND}" ] - then - echo "A QEMU binary was not found, You can set a custom location by using the QEMU= environment variable " - exit ${NOTFOUND} - elif [ -z "${qemu}" ] +for qemucmd in ${qemubinarysearch} +do + unset QEMUFOUND + unset qemu + if ! [ -z "${QEMUFOUND=$(${qemucmd} --help 2>/dev/null | grep "QEMU")}" ] && + ${qemucmd} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null; then - echo "No Qemu test device support found" - exit ${TESTDEVNOTSUPP} + qemu="${qemucmd}" + break fi +done + +if [ -z "${QEMUFOUND}" ] +then + echo "A QEMU binary was not found, You can set a custom location by using the QEMU= environment variable " + exit ${NOTFOUND} +elif [ -z "${qemu}" ] +then + echo "No Qemu test device support found" + exit ${TESTDEVNOTSUPP} fi if -- 2.1.0