A patch from Antti Tapaninen.

[rsync/rsync-patches.git] / verify-patches

diff --git a/verify-patches b/verify-patches
index 8a83cea..807c584 100755 (executable)
--- a/verify-patches
+++ b/verify-patches
@@ -3,8 +3,6 @@
 use strict;
 use Getopt::Long;
 
-$" = '|'; # NOTE: we auto-join arrays using '|' instead of space!
-
 my @generated_files = qw( proto.h configure config.h.in rsync.1 rsyncd.conf.5 );
 
 my($no_cvs, $failures_only, $minor_updates, $prepare_source);
@@ -19,8 +17,10 @@ GetOptions(
     'auto-cmd|a=s' => sub { push(@auto_cmds, $_[1]) },
 ) or &usage;
 
+$" = '|';
 my $auto_regex = @auto_cmds ? qr/^(@auto_cmds)$/i : qr/^never$/;
 my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]';
+$" = ' ';
 
 chdir('patches') if -d 'patches';
 
@@ -31,6 +31,7 @@ from inside the patches subdir.
 EOT
 }
 
+$ENV{'LC_COLLATE'} = 'C';
 $| = 1;
 my $CONF_OPTS = '-C';
 
@@ -83,9 +84,9 @@ foreach my $diff (@ARGV) {
            }
            sleep(1) if $prepare_source; # Ensure later diffs get later times.
        }
-       if (!defined($conf_opts) && m#^\s*\./configure( .+)#) {
-           $conf_opts = $1;
-           $conf_opts =~ s/\s+\(.*?\)//;
+       if (!defined($conf_opts) && s#^\s+\./configure\s+##) {
+           chomp($conf_opts = $_);
+           $conf_opts =~ s/\s*\(.*?\)//;
        }
     }
     close IN;
@@ -120,7 +121,9 @@ foreach my $diff (@ARGV) {
            chomp $input;
            if ($input =~ s/^(-a|--auto-cmd=?)\s*//) {
                push(@auto_cmds, $input eq '' ? $default : $input);
+               $" = '|';
                $auto_regex = qr/^(@auto_cmds)$/i;
+               $" = ' ';
                next;
            }
            $ans = $input if $input ne '';
@@ -142,7 +145,9 @@ foreach my $diff (@ARGV) {
            }
            if ($cmd eq 'B') {
                chdir('workdir') or die $!;
-               system "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
+               my $cmd = "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
+               print "Running: $cmd\n";
+               system $cmd;
                chdir('..') or die $!;
                $default = '!make test';
                next;
@@ -194,7 +199,7 @@ sub apply_patch
     system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
     print "\nApplying patch $diff...\n";
     undef @rejects;
-    my($saw_failure, $saw_offset, $saw_fuzz);
+    my($saw_offset, $saw_fuzz);
     open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
     while (<IN>) {
        print $_;
@@ -203,15 +208,13 @@ sub apply_patch
            push(@new, $_) unless -f "cvsdir/$_";
        } elsif (s/.* saving rejects to file //) {
            push(@rejects, $_);
-       } elsif (/^Hunk #\d+ FAILED/) {
-           $saw_failure = 1;
        } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
            $saw_fuzz ||= defined $1;
            $saw_offset = 1;
        }
     }
     close IN;
-    return 'F,D,E' if $saw_failure;
+    return 'F,D,E' if @rejects;
     return 'D,E' if $saw_fuzz && !$failures_only;
     return 'D,U,N' if $saw_offset && !$failures_only;
     'N';