diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 18:08:00 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 18:08:00 +0200 |
| commit | 7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34 (patch) | |
| tree | bd2cbe93e80692486c969a80cfececbf8bb6dcdd /source4/script | |
| parent | cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31 (diff) | |
| parent | bc4eacb5d89ca8dca123e2d6bd6eba47ed93b771 (diff) | |
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts:
source/auth/config.mk
source/auth/gensec/config.mk
source/torture/smbtorture.c
(This used to be commit edfd02e59bba86b977bd60848f57a614691fff7a)
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/harness2subunit.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/script/harness2subunit.pl b/source4/script/harness2subunit.pl index c14e4730e0..9f2391ad6c 100755 --- a/source4/script/harness2subunit.pl +++ b/source4/script/harness2subunit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl my $firstline = 1; - +my $error = 0; while(<STDIN>) { if ($firstline) { $firstline = 0; @@ -10,6 +10,7 @@ while(<STDIN>) { if (/^not ok (\d+) - (.*)$/) { print "test: $2\n"; print "failure: $2\n"; + $error = 1; } elsif (/^ok (\d+) - (.*)$/) { print "test: $2\n"; print "success: $2\n"; @@ -22,7 +23,10 @@ while(<STDIN>) { } elsif (/^not ok (\d+)$/) { print "test: $1\n"; print "failure: $1\n"; + $error = 1; } else { print; } } +exit $error; + |