# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/bvk/Work/grub2/mainline/
# testament_sha1: b34fa1addf6d937190819406127d3e76b86623a3
# timestamp: 2010-03-22 17:44:27 +0530
# base_revision_id: address@hidden
#   q8ppihzgyjyifcke
# 
# Begin patch
=== modified file 'conf/tests.rmk'
--- conf/tests.rmk	2010-01-22 13:37:27 +0000
+++ conf/tests.rmk	2010-03-22 08:32:48 +0000
@@ -50,6 +50,9 @@
 check_SCRIPTS += grub_script_vars1
 grub_script_vars1_SOURCES = tests/grub_script_vars1.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
@@ -59,6 +62,7 @@
 SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
+SCRIPTED_TESTS += grub_script_final_semicolon
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester

=== modified file 'script/parser.y'
--- script/parser.y	2010-01-25 16:31:14 +0000
+++ script/parser.y	2010-03-22 08:33:20 +0000
@@ -92,7 +92,7 @@
         {
           $$ = 0;
         }
-      | script statement delimiter
+      | script statement delimiter newlines0
         {
           struct grub_script_cmdblock *cmdblock;
           cmdblock = (struct grub_script_cmdblock *) $1;

=== added file 'tests/grub_script_final_semicolon.in'
--- tests/grub_script_final_semicolon.in	1970-01-01 00:00:00 +0000
+++ tests/grub_script_final_semicolon.in	2010-03-22 08:32:48 +0000
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
address@hidden@/grub-script-check <<EOF
+echo one;
+echo one; echo two
+echo one; echo two;
+echo one ; echo two ; 
+echo one ; echo two ; echo three 
+echo one; echo two ; echo three;   
+EOF

# Begin bundle
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