2 files changed, 4 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes
index fa35318..94a976c 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -2,6 +2,7 @@
 Wed Feb 12 20:57:35 CET 2014 - jdelvare@suse.de
 
 - test/run: Delay command line splitting.
+- test/run: Use perl module Text::ParseWords.
 
 -------------------------------------------------------------------
 Mon Feb 10 13:07:14 CET 2014 - jdelvare@suse.de
diff --git a/test/run b/test/run
index 6d06d8a..920e8bc 100755
--- a/test/run
+++ b/test/run
@@ -48,6 +48,7 @@ use strict;
 use FileHandle;
 use Getopt::Std;
 use POSIX qw(isatty setuid getcwd);
+use Text::ParseWords;
 use vars qw($opt_l $opt_q $opt_v %output);
 
 no warnings qw(taint);
@@ -267,8 +268,8 @@ sub sg($) {
 sub exec_test($$) {
   my ($raw_prog, $in) = @_;
   local (*IN, *IN_DUP, *IN2, *OUT_DUP, *OUT, *OUT2);
-  my $prog = [ map { s/\\(.)/$1/g; $_ } split /(?<!\\)\s+/, $raw_prog ];
-  my $needs_shell = ($raw_prog =~ /[][|<>;"'`\$\*\?]/);
+  my $prog = [ shellwords($raw_prog) ];
+  my $needs_shell = ($raw_prog =~ /[][|<>;`\$\*\?]/);
 
   if ($prog->[0] eq "umask") {
     umask oct $prog->[1];