diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/edit.test | 9 | ||||
-rwxr-xr-x | test/run | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/edit.test b/test/edit.test index 5cc5dba..4c4c542 100644 --- a/test/edit.test +++ b/test/edit.test @@ -5,16 +5,21 @@ $ cd d $ cat > editor < #! /bin/sh < echo Editing $1 -< echo foo > $1 +< sed -e 's:foo:bar:' $1 > $1.new +< mv $1.new $1 $ chmod +x editor $ export EDITOR=%PWD/editor $ quilt new patch > Patch patches/patch is now on top $ cd subdir +$ echo foo > foo $ quilt edit foo > File subdir/foo added to patch ../patches/patch -> Editing foo +> Editing subdir/foo + +$ cat foo +> bar $ cd ../.. $ rm -rf d @@ -92,8 +92,11 @@ sub process_test($$$$) { my @good = (); my $nmax = (@$out > @$result) ? @$out : @$result; for (my $n=0; $n < $nmax; $n++) { - my $use_re = ($out->[$n] =~ /^~ /); - $out->[$n] =~ s/^~ //g; + my $use_re; + if (defined $out->[$n] && $out->[$n] =~ /^~ /) { + $use_re = 1; + $out->[$n] =~ s/^~ //g; + } if (!defined($out->[$n]) || !defined($result->[$n]) || (!$use_re && $result->[$n] ne $out->[$n]) || |