From f57c84cd6092166bc3543c7a564b0d8f60d5104a Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 8 Jun 2012 20:31:05 +0200 Subject: [PATCH] * tests/grub_script_expansion.in: Skip network protocols. --- ChangeLog | 4 ++++ tests/grub_script_expansion.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a464af61e..5ab2b71a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-06-08 Vladimir Serbinenko + + * tests/grub_script_expansion.in: Skip network protocols. + 2012-06-08 Vladimir Serbinenko * tests/util/grub-shell.in: Use escc-ch-a port on ppc. diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in index 1575bff61..45bfcc5e7 100644 --- a/tests/grub_script_expansion.in +++ b/tests/grub_script_expansion.in @@ -17,7 +17,7 @@ set -e # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -disks=`echo ls | @builddir@/grub-shell` +disks=`echo ls | @builddir@/grub-shell| grep -v '^Network protocols:$'| grep -v '^tftp http $'` other=`echo insmod regexp\; echo \* | @builddir@/grub-shell` for d in $disks; do if echo "$d" |grep ',' >/dev/null; then