1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't run test "forever" with mysql-test-run --valgrind

Browse Source 
Test times when using --valgrind are now 4 hours and server start/shutdown
time 180 seconds.
The whole test suite time is caped at 1 day instead of 7 days

Reviewer: Monty
This commit is contained in:
Sergei Golubchik 2021-06-11 14:24:03 +03:00 committed by Monty
parent 9d261eeca8
commit 6f15a8e4f7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/lib/My/Debugger.pm
View File

@ -45,6 +45,7 @@ my %debuggers = (
script => 'set args {args} < {input}', script => 'set args {args} < {input}',
}, },
ddd => { ddd => {
interactive => 1,
options => '--command {script} {exe}', options => '--command {script} {exe}',
script => 'set args {args} < {input}', script => 'set args {args} < {input}',
}, },
@ -53,9 +54,11 @@ my %debuggers = (
options => '-c "stop in main; run {exe} {args} < {input}"', options => '-c "stop in main; run {exe} {args} < {input}"',
}, },
devenv => { devenv => {
interactive => 1,
options => '/debugexe {exe} {args}', options => '/debugexe {exe} {args}',
}, },
windbg => { windbg => {
interactive => 1,
options => '{exe} {args}', options => '{exe} {args}',
}, },
lldb => { lldb => {
@ -190,11 +193,15 @@ sub fix_options(@) {
sub pre_setup() { sub pre_setup() {
my $used; my $used;
my $interactive;
for my $k (keys %debuggers) { for my $k (keys %debuggers) {
for my $opt ($k, "manual-$k", "boot-$k", "client-$k") { for my $opt ($k, "manual-$k", "boot-$k", "client-$k") {
if ($opt_vals{$opt}) if ($opt_vals{$opt})
{ {
$used = 1; $used = 1;
$interactive ||= ($debuggers{$k}->{interactive} ||
$debuggers{$k}->{term} ||
($opt =~ /^manual-/));
if ($debuggers{$k}->{pre}) { if ($debuggers{$k}->{pre}) {
$debuggers{$k}->{pre}->(); $debuggers{$k}->{pre}->();
delete $debuggers{$k}->{pre}; delete $debuggers{$k}->{pre};
@ -209,10 +216,10 @@ sub pre_setup() {
$::opt_retry= 1; $::opt_retry= 1;
$::opt_retry_failure= 1; $::opt_retry_failure= 1;
$::opt_testcase_timeout= 7 * 24 * 60; # in minutes $::opt_testcase_timeout= ($interactive ? 24 : 4) * 60; # in minutes
$::opt_suite_timeout= 7 * 24 * 60; # in minutes $::opt_suite_timeout= 24 * 60; # in minutes
$::opt_shutdown_timeout= 24 * 60 *60; # in seconds $::opt_shutdown_timeout= ($interactive ? 24 * 60 : 3) * 60; # in seconds
$::opt_start_timeout= 24 * 60 * 60; # in seconds $::opt_start_timeout= $::opt_shutdown_timeout; # in seconds
} }
} }