1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-06 17:23:00 +01:00

git-svn: exit with status 1 for test failures

Some versions of the SVN libraries cause die() to exit with 255,
and 40cf043389 tightened up
test_expect_failure to reject return values >128.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-11-24 22:38:18 -08:00 committed by Junio C Hamano
parent 0d7a6e4ef9
commit b42a044f59

View file

@ -21,6 +21,7 @@
$ENV{LC_ALL} = 'C'; $ENV{LC_ALL} = 'C';
$| = 1; # unbuffer STDOUT $| = 1; # unbuffer STDOUT
sub fatal (@) { print STDERR $@; exit 1 }
# If SVN:: library support is added, please make the dependencies # If SVN:: library support is added, please make the dependencies
# optional and preserve the capability to use the command-line client. # optional and preserve the capability to use the command-line client.
# use eval { require SVN::... } to make it lazy load # use eval { require SVN::... } to make it lazy load
@ -571,7 +572,7 @@ sub commit_lib {
$no = 1; $no = 1;
} }
} }
close $fh or croak $?; close $fh or exit 1;
if (! defined $r_new && ! defined $cmt_new) { if (! defined $r_new && ! defined $cmt_new) {
unless ($no) { unless ($no) {
die "Failed to parse revision information\n"; die "Failed to parse revision information\n";
@ -873,13 +874,16 @@ sub commit_diff {
print "Committed $_[0]\n"; print "Committed $_[0]\n";
}, @lock) }, @lock)
); );
my $mods = libsvn_checkout_tree($ta, $tb, $ed); eval {
if (@$mods == 0) { my $mods = libsvn_checkout_tree($ta, $tb, $ed);
print "No changes\n$ta == $tb\n"; if (@$mods == 0) {
$ed->abort_edit; print "No changes\n$ta == $tb\n";
} else { $ed->abort_edit;
$ed->close_edit; } else {
} $ed->close_edit;
}
};
fatal "$@\n" if $@;
$_message = $_file = undef; $_message = $_file = undef;
return $rev_committed; return $rev_committed;
} }