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

Fix gcov in mtr.pl

Browse Source
This commit is contained in:
Magnus Svensson
2008-09-05 11:32:33 +02:00
parent 6a4af260cc
commit c3e7b68995
2 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mysql-test/lib/mtr_gcov.pl
View File

@ -20,25 +20,14 @@
use strict;
# These are not to be prefixed with "mtr_"
sub gcov_prepare ($) {
my ($dir)= @_;
sub gcov_prepare ();
sub gcov_collect ();
##############################################################################
#
#
#
##############################################################################
sub gcov_prepare () {
`find $::glob_basedir -name \*.gcov \
`find $dir -name \*.gcov \
-or -name \*.da | xargs rm`;
}
# Used by gcov
our @mysqld_src_dirs=
my @mysqld_src_dirs=
(
"strings",
"mysys",
@ -53,21 +42,24 @@ our @mysqld_src_dirs=
"sql",
);
sub gcov_collect () {
sub gcov_collect ($$$) {
my ($dir, $gcov, $gcov_msg, $err)= @_;
my $start_dir= cwd();
print "Collecting source coverage info...\n";
-f $::opt_gcov_msg and unlink($::opt_gcov_msg);
-f $::opt_gcov_err and unlink($::opt_gcov_err);
-f $gcov_msg and unlink($gcov_msg);
-f $gcov_err and unlink($gcov_err);
foreach my $d ( @mysqld_src_dirs )
{
chdir("$::glob_basedir/$d");
chdir("$dir/$d");
foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) )
{
`$::opt_gcov $f 2>>$::opt_gcov_err >>$::opt_gcov_msg`;
`$gcov $f 2>>$gcov_err >>$gcov_msg`;
}
chdir($::glob_mysql_test_dir);
chdir($start_dir);
}
print "gcov info in $::opt_gcov_msg, errors in $::opt_gcov_err\n";
print "gcov info in $gcov_msg, errors in $gcov_err\n";
}

22
mysql-test/mysql-test-run.pl
View File

@ -257,7 +257,7 @@ sub main {
command_line_setup(0);
if ( $opt_gcov ) {
gcov_prepare();
gcov_prepare($basedir);
}
if (!$opt_suites) {
@ -346,6 +346,11 @@ sub main {
mtr_print_line();
if ( $opt_gcov ) {
gcov_collect($basedir, $opt_gcov,
$opt_gcov_msg, $opt_gcov_err);
}
mtr_report_stats($completed);
exit(0);
@ -611,11 +616,6 @@ sub run_worker ($) {
command_line_setup($thread_num);
if ( $opt_gcov )
{
gcov_prepare();
}
setup_vardir();
check_running_as_root();
mysql_install_db($thread_num);
@ -649,16 +649,6 @@ sub run_worker ($) {
stop_all_servers();
if ( $opt_gcov )
{
gcov_collect(); # collect coverage information
}
if ( $opt_gcov )
{
gcov_collect(); # collect coverage information
}
exit(1);
}