* tests/grub_script_expansion.in: Skip network protocols.

diff --git a/ChangeLog b/ChangeLog
index a464af61ea318ff671e6200f36c142d893b75cb8..5ab2b71a2da6f231ebba9c072f16655dd0717a5f 100644 (file)
--- 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 1575bff619542ec9ab868c542103cb4336a3ec67..45bfcc5e7c354fba7c4be167c3e66c18efb42a70 100644 (file)
--- 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