From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 8 Jun 2012 18:31:05 +0000 (+0200)
Subject: 	* tests/grub_script_expansion.in: Skip network protocols.
X-Git-Tag: 2.00~92
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f57c84cd6092166bc3543c7a564b0d8f60d5104a;p=thirdparty%2Fgrub.git

	* tests/grub_script_expansion.in: Skip network protocols.
---

diff --git a/ChangeLog b/ChangeLog
index a464af61e..5ab2b71a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* tests/grub_script_expansion.in: Skip network protocols.
+
 2012-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* 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 <http://www.gnu.org/licenses/>.
 
-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