From cb7bb70c4902a38165e3d1cb3158704dbac228c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BCrgin?= <676c7473@gmail.com>
Date: Tue, 7 Apr 2015 16:48:21 +0200
Subject: [PATCH] scripts: Fix "test input line" logic in legacy2luatest.pl
 #2369

Fixes the handling of the initial input lines of a test script by simply
skipping all initial empty lines.

Helped-by: Florian Walch <florian@fwalch.com>
Suggested-by: Florian Walch <florian@fwalch.com>
---
 scripts/legacy2luatest.pl | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/scripts/legacy2luatest.pl b/scripts/legacy2luatest.pl
index 51997c037b..1a3f54146e 100755
--- a/scripts/legacy2luatest.pl
+++ b/scripts/legacy2luatest.pl
@@ -42,15 +42,8 @@ sub read_in_file {
     my $command_lines = $_[1];
     my $test_body_lines = $_[2];
 
-    # Only keep first input line if it is not empty.
-    my $first_input_line = shift @{$input_lines};
-    if ($first_input_line =~ /^$/) {
-      unshift @{$input_lines}, $first_input_line;
-    }
-
-    # If there are input lines left, wrap them with
-    # `insert` command and add before the previous command
-    # block.
+    # If there are input lines, wrap with an `insert`
+    # command and add before the previous command block.
     if (@{$input_lines}) {
       my $last_input_line = pop @{$input_lines};
       unshift @{$command_lines}, '';
@@ -168,7 +161,10 @@ sub read_in_file {
         return EMIT_COMMAND;
       }
 
-      push @input_lines, '  ' . $_;
+      # Skip initial lines if they are empty.
+      if (@input_lines or !/^$/) {
+        push @input_lines, '  ' . $_;
+      }
       return EMIT_INPUT;
     },
   );