diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-27 16:27:23 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:53 -0500 |
commit | 8a1d019f53ef6d1a6900a005b335bdc10d14bbe4 (patch) | |
tree | 6287922e476444ea86af7e9f834b531af77b8c63 | |
parent | 01ab492d286e40dd2118b6755223d7bdad2fec92 (diff) | |
download | samba-8a1d019f53ef6d1a6900a005b335bdc10d14bbe4.tar.gz samba-8a1d019f53ef6d1a6900a005b335bdc10d14bbe4.tar.xz samba-8a1d019f53ef6d1a6900a005b335bdc10d14bbe4.zip |
r24709: Convert perl test harness output to subunit for nicer display.
(This used to be commit 1be11bd0a5092ad9102587ea206388234983c479)
-rwxr-xr-x | source4/script/harness2subunit.pl | 28 | ||||
-rwxr-xr-x | source4/selftest/test_pidl.sh | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/source4/script/harness2subunit.pl b/source4/script/harness2subunit.pl new file mode 100755 index 0000000000..c14e4730e0 --- /dev/null +++ b/source4/script/harness2subunit.pl @@ -0,0 +1,28 @@ +#!/usr/bin/perl + +my $firstline = 1; + +while(<STDIN>) { + if ($firstline) { + $firstline = 0; + next; + } + if (/^not ok (\d+) - (.*)$/) { + print "test: $2\n"; + print "failure: $2\n"; + } elsif (/^ok (\d+) - (.*)$/) { + print "test: $2\n"; + print "success: $2\n"; + } elsif (/^ok (\d+)$/) { + print "test: $1\n"; + print "success: $1\n"; + } elsif (/^ok (\d+) # skip (.*)$/) { + print "test: $1\n"; + print "skip: $1 [\n$2\n]\n"; + } elsif (/^not ok (\d+)$/) { + print "test: $1\n"; + print "failure: $1\n"; + } else { + print; + } +} diff --git a/source4/selftest/test_pidl.sh b/source4/selftest/test_pidl.sh index ca11db590f..6a20cd9fc8 100755 --- a/source4/selftest/test_pidl.sh +++ b/source4/selftest/test_pidl.sh @@ -11,7 +11,7 @@ if test x"${PIDL_TESTS_SKIP}" = x"yes"; then echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes" elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then for f in pidl/tests/*.pl; do - plantest "$f" none $PERL $f + plantest "$f" none $PERL $f "|" ./script/harness2subunit.pl done else echo "Skipping pidl tests - Test::More not installed" |