diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 01:48:44 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 02:19:59 +0200 |
| commit | 8da78b732554a88bee0f1dd547e329fe8d82b7f9 (patch) | |
| tree | e4925fbcf93ca163b6363eac9823308f60a17be4 /source4 | |
| parent | c024fb7d5745dbca96b969c88284b70ac7c520e4 (diff) | |
| download | samba-8da78b732554a88bee0f1dd547e329fe8d82b7f9.tar.gz samba-8da78b732554a88bee0f1dd547e329fe8d82b7f9.tar.bz2 samba-8da78b732554a88bee0f1dd547e329fe8d82b7f9.zip | |
Move subunit helper utility to specific subunit directory.
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/script/harness2subunit.pl | 36 | ||||
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 |
2 files changed, 1 insertions, 37 deletions
diff --git a/source4/script/harness2subunit.pl b/source4/script/harness2subunit.pl deleted file mode 100755 index 45f515540b..0000000000 --- a/source4/script/harness2subunit.pl +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/perl -# Simple script that converts Perl test harness output to -# Subunit -# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org> -# Published under the GNU GPL, v3 or later - -my $firstline = 1; -my $error = 0; -while(<STDIN>) { - if ($firstline) { - $firstline = 0; - next; - } - 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"; - } 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"; - $error = 1; - } else { - print; - } -} -exit $error; - diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index bfe386af69..7ddaf9f996 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -252,7 +252,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 $samba4srcdir/../pidl/tests/*.pl; do - plantest "pidl.`basename $f .pl`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl + plantest "pidl.`basename $f .pl`" none $PERL $f "|" $samba4srcdir/../lib/subunit/harness2subunit.pl done else echo "Skipping pidl tests - Test::More not installed" |