From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOF1G-0002lS-Ej
	for qemu-devel@nongnu.org; Tue, 07 Jul 2009 14:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOF1C-0002lG-54
	for qemu-devel@nongnu.org; Tue, 07 Jul 2009 14:03:54 -0400
Received: from [199.232.76.173] (port=56658 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOF1B-0002lD-RP
	for qemu-devel@nongnu.org; Tue, 07 Jul 2009 14:03:49 -0400
Received: from verein.lst.de ([213.95.11.210]:57769)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <hch@lst.de>) id 1MOF1A-0000LJ-Qm
	for qemu-devel@nongnu.org; Tue, 07 Jul 2009 14:03:49 -0400
Received: from verein.lst.de (localhost [127.0.0.1])
	by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id
	n67I3l68006320
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <qemu-devel@nongnu.org>; Tue, 7 Jul 2009 20:03:47 +0200
Received: (from hch@localhost)
	by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id n67I3kk3006319
	for qemu-devel@nongnu.org; Tue, 7 Jul 2009 20:03:46 +0200
Date: Tue, 7 Jul 2009 20:03:46 +0200
From: Christoph Hellwig <hch@lst.de>
Message-ID: <20090707180346.GA6233@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] qemu-iotests: look for qemu-iotests-$ARCH
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Look for the binary as installed by qemu make install instead of
requiring the qemu symlink.  Note that we need a couple of regular
expressions to munge the uname output into the architecture name
qemu expects.


Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/common.config b/common.config
index a594632..0a8d5b4 100644
--- a/common.config
+++ b/common.config
@@ -39,6 +39,16 @@ PATH=".:$PATH"
 
 HOST=`hostname -s`
 HOSTOS=`uname -s`
+ARCH=`uname -m | \
+	sed -e s/i.86/x86_64/ \
+	    -e s/sun4u/sparc/ \
+	    -e s/arm.*/arm/ \
+	    -e s/sa110/arm/ \
+	    -e s/s390x/s390/ \
+	    -e s/parisc.*/hppa/ \
+	    -e s/ppc.*/powerpc/ \
+	    -e s/mips.*/mips/ \
+	    -e s/sh[234].*/sh/`
 
 EMAIL=root@localhost    # where auto-qa will send its status messages
 export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
@@ -88,7 +98,7 @@ export BC_PROG="`set_prog_path bc`"
 
 export PS_ALL_FLAGS="-ef"
 
-export QEMU_PROG="`set_prog_path qemu`"
+export QEMU_PROG="`set_prog_path qemu-system-$ARCH`"
 [ "$QEMU_PROG" = "" ] && _fatal "qemu not found"
 
 export QEMU_IMG_PROG="`set_prog_path qemu-img`"