database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

WL #5680 MTR results written to file with well defined format

Browse Source 
Added --result-file option, which will produce var/mtr-results.txt
Output has a simple format:

<tag> : <value>  for general info on test run
{
  <tag> : <value>
  ....
}                for each test

Output from failed tests are included but may be truncated.
See WL for more details.
This commit is contained in:
Bjorn Munch
2011-05-09 16:07:43 +02:00
parent 4f3c366e58
commit cb15b0712d
5 changed files with 276 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/lib/My/CoreDump.pm
View File

@ -1,5 +1,5 @@
# -*- cperl -*-
# Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc.
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -21,6 +21,7 @@ use Carp;
use My::Platform;
use File::Temp qw/ tempfile tempdir /;
use mtr_results;
my $hint_mysqld; # Last resort guess for executable path
@ -80,7 +81,7 @@ sub _gdb {
return if $? >> 8;
return unless $gdb_output;
print <<EOF, $gdb_output, "\n";
resfile_print <<EOF, $gdb_output, "\n";
Output from gdb follows. The first stack trace is from the failing thread.
The following stack traces are from all threads (so the failing one is
duplicated).
@ -124,7 +125,7 @@ sub _dbx {
return if $? >> 8;
return unless $dbx_output;
print <<EOF, $dbx_output, "\n";
resfile_print <<EOF . $dbx_output . "\n";
Output from dbx follows. Stack trace is printed for all threads in order,
above this you should see info about which thread was the failing one.
----------------------------
@ -244,7 +245,7 @@ sub _cdb {
$cdb_output=~ s/^Child\-SP RetAddr Call Site//gm;
$cdb_output=~ s/\+0x([0-9a-fA-F]+)//gm;
print <<EOF, $cdb_output, "\n";
resfile_print <<EOF, $cdb_output, "\n";
Output from cdb follows. Faulting thread is printed twice,with and without function parameters
Search for STACK_TEXT to see the stack trace of
the faulting thread. Callstacks of other threads are printed after it.

23
mysql-test/lib/My/Test.pm
View File

@ -1,6 +1,6 @@
# -*- cperl -*-
# Copyright (C) 2008 MySQL AB
#
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
@ -23,6 +23,7 @@ package My::Test;
use strict;
use warnings;
use Carp;
use mtr_results;
sub new {
@ -66,9 +67,26 @@ sub is_failed {
}
my %result_names= (
'MTR_RES_PASSED' => 'pass',
'MTR_RES_FAILED' => 'fail',
'MTR_RES_SKIPPED' => 'skipped',
);
sub write_test {
my ($test, $sock, $header)= @_;
if ($::opt_resfile && defined $test->{'result'}) {
resfile_test_info("result", $result_names{$test->{'result'}});
if ($test->{'timeout'}) {
resfile_test_info("comment", "Timeout");
} elsif (defined $test->{'comment'}) {
resfile_test_info("comment", $test->{'comment'});
}
resfile_test_info("result", "warning") if defined $test->{'check'};
resfile_to_test($test);
}
# Give the test a unique key before serializing it
$test->{key}= "$test" unless defined $test->{key};
@ -113,6 +131,7 @@ sub read_test {
$test->{$key}= _decode($value);
}
}
resfile_from_test($test) if $::opt_resfile;
return $test;
}