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

merged with mainline
---

dae0d05f2d91d57df6ebc0c8d1a014a44ed1a23f
diff --cc conf/tests.rmk
index fdf554a15,88ce09e60..ca1f0cd71
--- a/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