From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 30 May 2016 16:59:42 +0000 (+0200)
Subject: test-wrap-argv: use map and join instead of a for cycle
X-Git-Tag: v2.0.0-rc1~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8da1cbf13a782854e780e5449f6758aea15180d;p=thirdparty%2Flibvirt.git

test-wrap-argv: use map and join instead of a for cycle

We have a list of parameters in @args, that need to be rewrapped
and separated by a space and escaped newline: " \\\n", with the
exception of the last one, which only needs a newline.

Instead of a for cycle, rewrap the individual arguments using map,
and interleave them with escaped newlines by using join.
---

diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl
index 693bed558c..4e942cd90f 100755
--- a/tests/test-wrap-argv.pl
+++ b/tests/test-wrap-argv.pl
@@ -100,18 +100,10 @@ sub rewrap_line {
         }
     }
 
-    # Print env + command first
-    print join(" \\\n", @env, $cmd), " \\\n";
     # We might have to split line argument values...
-    for (my $i = 0; $i <= $#args; $i++) {
-        print &rewrap_arg($args[$i]);
-
-        if ($i != $#args) {
-            print " \\\n";
-        } else {
-            print "\n";
-        }
-    }
+    @args = map { &rewrap_arg($_) } @args;
+    # Print env + command first
+    print join(" \\\n", @env, $cmd, @args), "\n";
 }
 
 sub rewrap_arg {