ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: handle better timeout 

Relying on the timeout program
This commit is contained in:
Gregory Hainaut 2016-01-24 22:32:00 +01:00
parent 8485a8c654
commit 393e56a604
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/run_test.pl
View File

@ -63,7 +63,7 @@ $o_bad = 0;
$o_regression = 0; $o_regression = 0;
$o_cygwin = 0; $o_cygwin = 0;
$o_max_cpu = 1; $o_max_cpu = 1;
$o_timeout = 20; $o_timeout = 30;
$o_help = 0; $o_help = 0;
$o_debug_me = 0; $o_debug_me = 0;
$o_dry_run = 0; $o_dry_run = 0;
@ -326,13 +326,14 @@ sub run_elf {
my $line; my $line;
my $dump = 0; my $dump = 0;
my $cancel = 0;
open(my $run, ">$out") or die "Impossible to open $!"; open(my $run, ">$out") or die "Impossible to open $!";
my $command = test_cmd($elf, $cfg); my $command = test_cmd($elf, $cfg);
print "EXEC: $command\n" if $o_debug_me; print "EXEC: $command\n" if $o_debug_me;
return unless ($command ne ""); return unless ($command ne "");
my $pid = open(my $log, "$command |") or die "Impossible to pipe $!"; my $pid = open(my $log, "timeout $o_timeout $command |") or die "Impossible to pipe $!";
#print "INFO: Execute $elf (PID=$pid) with cfg ($cfg)\n" if $o_debug_me; #print "INFO: Execute $elf (PID=$pid) with cfg ($cfg)\n" if $o_debug_me;
# Kill me # Kill me
@ -343,7 +344,7 @@ sub run_elf {
threads->exit(); threads->exit();
}; };
while ($line = <$log>) { while (not $cancel and $line = <$log>) {
$mt_timeout = $o_timeout; # Keep me alive $mt_timeout = $o_timeout; # Keep me alive
$line =~ s/\e\[\d+(?>(;\d+)*)m//g; $line =~ s/\e\[\d+(?>(;\d+)*)m//g;
@ -355,8 +356,10 @@ sub run_elf {
} }
if ($line =~ /-- TEST END/) { if ($line =~ /-- TEST END/) {
$dump = 0; $dump = 0;
$cancel = 1;
print "INFO: kill process $pid\n" if $o_debug_me; print "INFO: kill process $pid\n" if $o_debug_me;
kill 'KILL', $pid; kill 'KILL', -$pid;
#system("kill -9 -- -$pid");
} }
} }
} }
@ -446,7 +449,7 @@ sub kill_thread_if_timeout {
foreach my $thr (threads->list()) { foreach my $thr (threads->list()) {
# Farewell my friend # Farewell my friend
print "ERROR: send kill on timeout process\n"; print "ERROR: send kill on timeout process\n";
$thr->kill('KILL')->detach(); $thr->kill('KILL')->join();
} }
$mt_timeout = 100; $mt_timeout = 100;
} }