From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Nkjb0-0003Po-Ej for mharc-grub-devel@gnu.org; Thu, 25 Feb 2010 14:42:02 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nkjax-0003NF-FL for grub-devel@gnu.org; Thu, 25 Feb 2010 14:41:59 -0500 Received: from [140.186.70.92] (port=37958 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nkjaw-0003M4-6v for grub-devel@gnu.org; Thu, 25 Feb 2010 14:41:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nkjau-0005LZ-Na for grub-devel@gnu.org; Thu, 25 Feb 2010 14:41:58 -0500 Received: from mail-bw0-f219.google.com ([209.85.218.219]:44740) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nkjau-0005Kr-IP for grub-devel@gnu.org; Thu, 25 Feb 2010 14:41:56 -0500 Received: by bwz19 with SMTP id 19so4996919bwz.26 for ; Thu, 25 Feb 2010 11:41:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :x-enigmail-version:content-type; bh=khgvQ+g2hk/Efuq9zBzTM5NZHs+esdkD79Stwhrcg60=; b=OZ+qPVanIkRfNXLjY4MIPyGvUXHxZIJuB2uhFxnhAlWDdY2oUGtTQHKEoKt9b9LZSF oCAOXVHJMdSt9hbYvnKENmeRAotMngGtfwMnhUYK7Plh0XXFdj2b696SQg6Hg6ehRhod B3cv1qozJVD3ulvD5GDTJS3MF9LIGiYXpyXOw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; b=LpQJQtB/MYPXZBlSjovnb2SGAbRfAawALzAqpErLjrYtMI6NZnJvFo+6eSmPDDPHWA 9tvouFSxiPymaROYLltseQReSqMsULIfY7aqGsPSPAzxYNq7R1ayhheMmKbqd3jZFxGm NmHCog/lHf4MYxBpzff0tdtgHUDEVDQwmLpLc= Received: by 10.204.33.210 with SMTP id i18mr26107bkd.119.1267126890983; Thu, 25 Feb 2010 11:41:30 -0800 (PST) Received: from debian.bg45.phnet (gprs57.swisscom-mobile.ch [193.247.250.57]) by mx.google.com with ESMTPS id 15sm3748427bwz.8.2010.02.25.11.41.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 25 Feb 2010 11:41:26 -0800 (PST) Message-ID: <4B86D25B.8040700@gmail.com> Date: Thu, 25 Feb 2010 20:41:15 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) MIME-Version: 1.0 To: The development of GNU GRUB References: <1266676133.2348.30.camel@x200> In-Reply-To: <1266676133.2348.30.camel@x200> X-Enigmail-Version: 0.95.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig8E6B30C05FA4C620747C648B" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: [PATCH] locate the qemu binary in the grub-shell test X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 19:41:59 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig8E6B30C05FA4C620747C648B Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Dustin Kirkland wrote: > The grub-shell test assumes that qemu-system-i386 will be the binary > used, and that it's available on the system. Actually, on amd64/x86_64= > systems, the appropriate binary is qemu-system-x86_64. =20 Currently grub-shell supports only i386-pc target and the right qemu architecture to test it with is system-i386. qemu-system-x86_64 is appropriate only for amd64-specific tests (you can have a look at my bootchecks branch). Architecture of build has nothing to do with architecture of target: you can very well cross-compile for i386-pc from mips. It's not any different than cross-compiling to i386-pc from x86_64 (the only difference is that you use biarch compiler) > Furthermore, an > appropriate error should be thrown if neither executable is found. > > 2010-02-20 Dustin Kirkland > > * tests/util/grub-shell.in: locate the appropriate qemu system = > binary, and exit non-zero, with an error message, if none are= =20 > found > > diff -Nur -x '*.orig' -x '*~' lucid/tests/util/grub-shell.in lucid.new/= tests/util/grub-shell.in > --- lucid/tests/util/grub-shell.in 2010-02-20 07:58:35.062756000 -0600 > +++ lucid.new/tests/util/grub-shell.in 2010-02-20 08:22:07.797858157 -0= 600 > @@ -92,6 +92,18 @@ > esac > done > =20 > +qemu=3D > +for i in qemu-system-i386 qemu-system-x86_64; do > + if which ${i} >/dev/null; then > + qemu=3D${i} > + break > + fi > +done > +if [ "x${qemu}" =3D x ]; then > + echo "qemu is not installed" 1>&2 > + exit 1 > +fi > + > if [ "x${source}" =3D x ] ; then > tmpfile=3D`mktemp` > while read; do > @@ -135,8 +147,7 @@ > cp ${isofile} ${fdafile} > =20 > outfile=3D`mktemp` > -qemu-system-i386 ${qemuopts} -nographic -serial stdio -hda ${hdafile} = -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfil= e} > - > +${qemu} ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fd= afile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile} > cat $outfile > =20 > rm -f ${tmpfile} ${outfile} ${cfgfile} ${isofile} ${hdafile} ${fdafile= } > > =20 > -----------------------------------------------------------------------= - > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig8E6B30C05FA4C620747C648B Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iF4EAREKAAYFAkuG0lsACgkQNak7dOguQgn9MgD+KgBgv6QtivCH2N4AJifhG5qA jPPVS9DVpkEYDFPKOjEBALL9AWR/3f6JxWAfwkklQKNAf9BdpVqh6VO2giOiZBoF =LsyG -----END PGP SIGNATURE----- --------------enig8E6B30C05FA4C620747C648B--