vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* tests/grub_script_expansion.in: Use fixed-string grep to skip over

Browse source 
firmware error messages.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-15 01:53:33 +02:00
parent cbe57a487b
commit fa7d914e6c
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-04-15 Vladimir Serbinenko <phcoder@gmail.com>
* tests/grub_script_expansion.in: Use fixed-string grep to skip over
firmware error messages.
2013-04-15 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_devalias_next): Make * grub-core/kern/ieee1275/openfw.c (grub_ieee1275_devalias_next): Make

6
tests/grub_script_expansion.in
View file

@ -21,12 +21,12 @@ disks=`echo ls | @builddir@/grub-shell| grep -av '^Network protocols:$'| grep -a
other=`echo insmod regexp\; echo \* | @builddir@/grub-shell` other=`echo insmod regexp\; echo \* | @builddir@/grub-shell`
for d in $disks; do for d in $disks; do
if echo "$d" |grep ',' >/dev/null; then if echo "$d" |grep ',' >/dev/null; then
if echo "$other" | grep "$d" >/dev/null; then if echo "$other" | grep -F -- "$d" >/dev/null; then
echo "$d should not occur in * expansion" >&2 echo "$d should not occur in * expansion" >&2
exit 1 exit 1
fi fi
else else
if ! echo "$other" | grep "$d" >/dev/null; then if ! echo "$other" | grep -F -- "$d" >/dev/null; then
echo "$d missing from * expansion" >&2 echo "$d missing from * expansion" >&2
exit 1 exit 1
fi fi
@ -35,7 +35,7 @@ done
other=`echo insmod regexp\; echo '(*)' | @builddir@/grub-shell` other=`echo insmod regexp\; echo '(*)' | @builddir@/grub-shell`
for d in $disks; do for d in $disks; do
if ! echo "$other" | grep -F "$d" >/dev/null; then if ! echo "$other" | grep -F -- "$d" >/dev/null; then
echo "$d missing from (*) expansion" >&2 echo "$d missing from (*) expansion" >&2
exit 1 exit 1
fi fi