selftest/subunit: Add diff command that can diff two subunit streams.

[ira/wip.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index da2594395745f2ed79f10622fd3e919c7733a8b8..3094f78b8e515e079a5863f15ab851bdc5c47b71 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -129,7 +129,8 @@ use Getopt::Long;
 use POSIX;
 use Cwd qw(abs_path);
 use lib "$RealBin";
-use Subunit;
+use Subunit qw(parse_results);
+use Subunit::Filter;
 use SocketWrapper;
 
 my $opt_help = 0;
@@ -219,12 +220,32 @@ sub run_testsuite($$$$$)
        Subunit::report_time(time());
        Subunit::start_testsuite($name);
 
-       system("$cmd 2>&1 | $RealBin/filter-subunit.pl --prefix \"$name.\"");
-       my $ret = $?;
-       if ($ret == -1) {
-               Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
-               return 0;
-       } elsif ($ret & 127) {
+       open(RESULTS, "$cmd 2>&1|");
+       my $statistics = {
+               TESTS_UNEXPECTED_OK => 0,
+               TESTS_EXPECTED_OK => 0,
+               TESTS_UNEXPECTED_FAIL => 0,
+               TESTS_EXPECTED_FAIL => 0,
+               TESTS_ERROR => 0,
+               TESTS_SKIP => 0,
+       };
+
+       my $msg_ops = new Subunit::Filter("$name\.", []);
+
+       parse_results($msg_ops, $statistics, *RESULTS);
+
+       my $ret = 0;
+
+       unless (close(RESULTS)) {
+               if ($!) {
+                       Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
+                       return 0;
+               } else {
+                       $ret = $?;
+               }
+       } 
+
+       if ($ret & 127) {
                Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without"));
                return 0;
        }
@@ -238,14 +259,11 @@ sub run_testsuite($$$$$)
        my $exitcode = $ret >> 8;
 
        Subunit::report_time(time());
-       my $reason = "Exit code was $exitcode";
-       my $result;
        if ($exitcode == 0) {
-               $result = "success";
+               Subunit::end_testsuite($name, "success");
        } else {
-               $result = "failure";
+               Subunit::end_testsuite($name, "failure", "Exit code was $exitcode");
        }
-       Subunit::end_testsuite($name, $result, $reason);
 
        cleanup_pcap($pcap_file, $exitcode);