merged with mainline

diff --cc conf/tests.rmk
index 442beb0d330d084c9a1631ba1b5c88485722d92f,ca1f0cd71f92d3b6e1a09ebd4665bc62f7aebb4f..5f78ea94011a520a1d5467bf934efdee40d9ef32
--- 1/conf/tests.rmk
--- 2/conf/tests.rmk
+++ b/conf/tests.rmk
@@@ -53,9 -53,12 +53,15 @@@ 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_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
@@@ -66,7 -69,8 +72,9 @@@ 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_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