diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-20 15:54:02 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 06:28:47 +0100 |
| commit | 254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2 (patch) | |
| tree | 2c298314e59ed3db7e3dbecb6c66e465800e9afb /source4/selftest/selftest.pl | |
| parent | 9ca5a267466f7b1b83a906b1f3b8b1b953222f21 (diff) | |
| download | samba-254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2.tar.gz samba-254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2.tar.bz2 samba-254f1c6fee18dd14d2f9f97d65e6fe9ef04c26f2.zip | |
r26547: Make testsuites less special during subunit handling.
(This used to be commit 0bf6bdcd7f21740853ae852193d51bdf14201782)
Diffstat (limited to 'source4/selftest/selftest.pl')
| -rwxr-xr-x | source4/selftest/selftest.pl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 456b483f07..4dbdb2da62 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -251,19 +251,26 @@ sub run_testsuite($$$$$$$) setup_pcap($msg_state); - open(RESULT, "$cmd 2>&1|"); - $msg_ops->start_testsuite($name, $msg_state); + $msg_ops->start_test($msg_state, [], $name); + open(RESULT, "$cmd 2>&1|"); my $expected_ret = parse_results( - $msg_ops, $msg_state, $statistics, *RESULT, \&expecting_failure); + $msg_ops, $msg_state, $statistics, *RESULT, \&expecting_failure, [$name]); + + my $envlog = getlog_env($envname); + $msg_ops->output_msg($msg_state, "ENVLOG: $envlog\n") if ($envlog ne ""); my $ret = close(RESULT); $ret = 0 unless $ret == 1; - cleanup_pcap($msg_state, $expected_ret, $ret); + if ($ret == 1) { + $msg_ops->end_test($msg_state, [], $name, "success", $expected_ret != $ret, undef); + } else { + $msg_ops->end_test($msg_state, [], $name, "failure", $expected_ret != $ret, + "Returned $ret"); + } - $msg_ops->end_testsuite($name, $msg_state, $expected_ret, $ret, - getlog_env($msg_state->{ENVNAME})); + cleanup_pcap($msg_state, $expected_ret, $ret); if (not $opt_socket_wrapper_keep_pcap and defined($msg_state->{PCAP_FILE})) { |