merged with mainline

diff --cc conf/tests.rmk
index 47dea7fb15ad0e5930840097156f03cc77a5b06c,92f14797da6f50b9d3a564d2c43ec5e6e514cfb2..88ce09e6003b8297e62ea4cd27ebd4fdce285336
--- 1/conf/tests.rmk
--- 2/conf/tests.rmk
+++ b/conf/tests.rmk
@@@ -50,9 -50,9 +50,12 @@@ 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
 +
  # List of tests to execute on "make check"
  # SCRIPTED_TESTS    = example_scripted_test
  # SCRIPTED_TESTS   += example_grub_script_test
@@@ -62,7 -62,7 +65,8 @@@
  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
  
  # dependencies between tests and testing-tools
  $(SCRIPTED_TESTS): grub-shell grub-shell-tester