merged with mainline

diff --cc conf/tests.rmk
index fdf554a1558c93c3fe4cdfa97df76e605f4fa79b,88ce09e6003b8297e62ea4cd27ebd4fdce285336..ca1f0cd71f92d3b6e1a09ebd4665bc62f7aebb4f
--- 1/conf/tests.rmk
--- 2/conf/tests.rmk
+++ b/conf/tests.rmk
@@@ -50,9 -50,12 +50,15 @@@ grub_script_echo_keywords_SOURCES = tes
  check_SCRIPTS += grub_script_vars1
  grub_script_vars1_SOURCES = tests/grub_script_vars1.in
  
+ check_SCRIPTS += grub_script_for1
+ grub_script_for1_SOURCES = tests/grub_script_for1.in
+ 
+ check_SCRIPTS += grub_script_blanklines
+ grub_script_blanklines_SOURCES = tests/grub_script_blanklines.in
+ 
 +check_SCRIPTS += grub_script_final_semicolon
 +grub_script_final_semicolon_SOURCES = tests/grub_script_final_semicolon.in
 +
  # List of tests to execute on "make check"
  # SCRIPTED_TESTS    = example_scripted_test
  # SCRIPTED_TESTS   += example_grub_script_test
@@@ -62,7 -65,8 +68,9 @@@
  SCRIPTED_TESTS  = grub_script_echo1
  SCRIPTED_TESTS += grub_script_echo_keywords
  SCRIPTED_TESTS += grub_script_vars1
+ SCRIPTED_TESTS += grub_script_for1
+ SCRIPTED_TESTS += grub_script_blanklines
 +SCRIPTED_TESTS += grub_script_final_semicolon
  
  # dependencies between tests and testing-tools
  $(SCRIPTED_TESTS): grub-shell grub-shell-tester

diff --cc script/parser.y
Simple merge