merged with mainline

diff --cc conf/tests.rmk
index 427720e82d854480da01ffc2fdb7ed8c19ba6e25,ca1f0cd71f92d3b6e1a09ebd4665bc62f7aebb4f..6259ad89fc0161680ef82520a3e0f96ae911f0d5
--- 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_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
+ 
 +check_SCRIPTS += grub_script_if
 +grub_script_if_SOURCES = tests/grub_script_if.in
 +
  # List of tests to execute on "make check"
  # SCRIPTED_TESTS    = example_scripted_test
  # SCRIPTED_TESTS   += example_grub_script_test
@@@ -66,8 -69,9 +72,11 @@@ 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_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
Simple merge