From: BVK Chaitanya Date: Fri, 9 Apr 2010 17:02:58 +0000 (+0530) Subject: merged with mainline X-Git-Tag: 1.99~970^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68b31b54f5c581a53d7369affc185f2f8283edeb;p=thirdparty%2Fgrub.git merged with mainline --- 68b31b54f5c581a53d7369affc185f2f8283edeb diff --cc conf/tests.rmk index 6259ad89f,5f78ea940..11e5f2a1a --- a/conf/tests.rmk +++ b/conf/tests.rmk @@@ -53,6 -53,9 +53,12 @@@ grub_script_vars1_SOURCES = tests/grub_ check_SCRIPTS += grub_script_for1 grub_script_for1_SOURCES = tests/grub_script_for1.in + check_SCRIPTS += grub_script_while1 + grub_script_while1_SOURCES = tests/grub_script_while1.in + ++check_SCRIPTS += grub_script_if ++grub_script_if_SOURCES = tests/grub_script_if.in ++ check_SCRIPTS += grub_script_blanklines grub_script_blanklines_SOURCES = tests/grub_script_blanklines.in @@@ -72,11 -72,10 +75,12 @@@ SCRIPTED_TESTS = grub_script_echo SCRIPTED_TESTS += grub_script_echo_keywords SCRIPTED_TESTS += grub_script_vars1 SCRIPTED_TESTS += grub_script_for1 + SCRIPTED_TESTS += grub_script_while1 ++SCRIPTED_TESTS += grub_script_if SCRIPTED_TESTS += grub_script_blanklines SCRIPTED_TESTS += grub_script_final_semicolon - SCRIPTED_TESTS += grub_script_if + # dependencies between tests and testing-tools $(SCRIPTED_TESTS): grub-shell grub-shell-tester $(FUNCTIONAL_TESTS): functional_test.mod diff --cc script/parser.y index 90f3215f3,a30dd78b3..b5815ea8d --- a/script/parser.y +++ b/script/parser.y @@@ -74,8 -74,9 +74,10 @@@ %token GRUB_PARSER_TOKEN_WORD "word" %type word argument arguments0 arguments1 - %type script_init script grubcmd ifclause ifcmd forcmd command - %type commands1 menuentry statement ++ + %type script_init script -%type grubcmd ifcmd forcmd whilecmd untilcmd ++%type grubcmd ifclause ifcmd forcmd whilecmd untilcmd + %type command commands1 menuentry statement %pure-parser %lex-param { struct grub_parser_param *state };