From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 26 Mar 2010 18:06:14 +0000 (+0530)
Subject: merged with mainline
X-Git-Tag: 1.99~1001^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03efaf45b2dca634080bd57b65ad4468a8243121;p=thirdparty%2Fgrub.git

merged with mainline
---

03efaf45b2dca634080bd57b65ad4468a8243121
diff --cc conf/tests.rmk
index 47dea7fb1,92f14797d..88ce09e60
--- a/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