# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/bvk/Work/grub2/mainline/
# testament_sha1: b99333fbdc905f06f129a2f9060cd05c97382e97
# timestamp: 2010-04-06 12:31:57 +0530
# base_revision_id: address@hidden
#   b0p34f2l1in9kjhn
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2010-04-05 19:47:32 +0000
+++ ChangeLog	2010-04-06 07:01:44 +0000
@@ -1,3 +1,9 @@
+2010-04-06  BVK Chaitanya  <address@hidden>
+
+	Fix unit testing framework for qemu 0.12.
+
+	* tests/util/grub-shell.in: Remove -serial stdio option.
+
 2010-04-06  Vladimir Serbinenko  <address@hidden>
 
 	POSIX header file wrappers.

=== modified file 'tests/util/grub-shell.in'
--- tests/util/grub-shell.in	2010-01-22 13:37:27 +0000
+++ tests/util/grub-shell.in	2010-04-06 06:51:11 +0000
@@ -135,7 +135,7 @@
 cp ${isofile} ${fdafile}
 
 outfile=`mktemp`
-qemu-system-i386 ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
+qemu-system-i386 ${qemuopts} -nographic -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
 
 cat $outfile
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXwMZt0AAtLfgAAwVHP/91sM
lQS////+UAW5NnsIqm7Ku27CbACUmihiE/KMQYiPTRNomhpoAAAlEjKbTIxEMSaCaMEGAEMgMJEg
miU9TTbVP1T2qZAzSaNMjBPUDymhocwCaYBMhgACYJgAAAkiJpoCanpppkE1T1N6NTJB5IAaaHqM
L83wSkeLNuPoMtpbJ5ROA1xnjXSJazPRIs7UIL7jop1fqR9p1xPy+t27OInpabbN2W1HloaBrVpl
SY1zmjaoF9d6WPwvPM+zyxXZDSTqMyKHqT7Gh/flFdcmXVCGnwpNDnScEGuUqYgMDYwbti2X0MkZ
lBB6UFaBeEUGuNDmofkdcJmMOQifgZGFC980RDkREGGBXDkiIieXhYLkSYN3pjSRoJDQLQEuEUlV
8Mbuf6TskFAuJwktaCzFejBQSmTuIE6OdFniT32lRM8x/CM8tA+pQKjaIqQY+JWAvjWMRuQT+Y1A
tMUCsafax4sdq4UMoDb08A0EeJ+y4sOIyPqjko8upLqxDYVbAmaZwdrlgG+cckI6yfWxEQ4Uo6S3
TfpxONTE3SK3EqFuurZgIORG3wLInBaVBGEZyI3KLXYWwrrmoKNdv3hMgm592BZHBsDSd+JqNXyW
b2CaoLh0gsICjScVLZQKW2BTupYHMKQiENxMrzjSHIUzfQgvCzkBiUKJsNkCVZCoiUESA76axXBW
5dz274qElFJVj1yHsoQP2K6zFiqUKIY0LjCDTaTfqaIpCrbWMmtIhbmQZKd5EVNdd/M1VoxJrDAv
VrJ2IUSqMsFrz2FMxhgQSN5YKMEtoNqv/glRmbtDCQPa+oovKJLTENj1D4buq6IPgDCaVRiSGC0i
IvNhQZDUlg4THEw8x4hNKUxinBeAeJwrY1e92Ygx5ZneXyOdJFcExMc9h94Vp7p9O9Tnv7PC+V/K
nhjqMBWIj+toaphhS4DG4tOmqlWc4+9HdjiFP10RJXYQLiJgfglzSRcvkjIjkMRB12UPvQW3CKlY
xp+JIN2G92pzHPJjsZMed9AxT8Xs97C4ZHY5jODCjF90z2ol8q3cK5nGPoSU6p7xPNL0EJZunigZ
rg3tRENDCtBZyXI16mPdoXGKHUhOTIiz69w4/hrxtOOCLXRECmtLNXMd3G4EH4+VlIvJxczZVNw8
bIkGMUjwComefNPVi8e5bN8qEmMLiLBcrWjleOFKY+BUFAuWHr8sxMGQmFcKvOk6I4HA1CJMCmEB
MZg+3PUUXiegNJmjHKt3mXDXc31IaDa+MN5rLTFZEbTZQIGMifemUJNKIW9JEfJJHT1D5joOZ7AN
f7CC10wkHX/g3C3FY06kHij0bIifkJiQ3QH3pIbvEMHDeuYN3peWEvr0MyJaUZjML0A0xwXmf5iU
l+wOyz0tSQx2W8ZB6apOF55AKwG5AegXgRIAblepCpGCDxDM9h17EzsJEGXWkjFGq84zyEMzLixM
oEC+ZWjgZCIhEByFSSXKm5lJEw1nB4oPWgk0GAirExVVSipSJDL+zJG4lQEiEOJxHJKQw6kTEqHO
WuEnSaSPhqHqGCDeK7gMMK+QVG+2NAySIqKDIrMqis53XmovNaixtu95A6W7ed+2kQxcbAmjrUKz
wsjmWJIkUjODCpikhrygxC1mBpjXjcgIFIWsNDqKYXn6vWkzVTu7quI4x8w2EVQ5AoeRYLgYnGRP
QgXBVkMlcKtnk4o3HJEQ24oMyqiuu0Bevt7CgXizA1SR0E/RA3cqV+igLE+YwRFUrskGdSme4trh
Lt/4u5IpwoSD4GM26A==