luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

runtests.pl: drop unused $clearlocks flag and logic

Browse Source
This commit is contained in:
Viktor Szakats 2025-02-26 15:27:50 +01:00
parent 2e1f8de611
commit b12b0a7478
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/runtests.pl
View File

@ -179,7 +179,6 @@ my %runnersrunning; # tests currently running by runner ID
my $short; my $short;
my $no_debuginfod; my $no_debuginfod;
my $keepoutfiles; # keep stdout and stderr files after tests my $keepoutfiles; # keep stdout and stderr files after tests
my $clearlocks; # force removal of files by killing locking processes
my $postmortem; # display detailed info about failed tests my $postmortem; # display detailed info about failed tests
my $run_disabled; # run the specific tests even if listed in DISABLED my $run_disabled; # run the specific tests even if listed in DISABLED
my $scrambleorder; my $scrambleorder;
@ -1837,22 +1836,17 @@ sub singletest {
if($singletest_state{$runnerid} == ST_INIT) { if($singletest_state{$runnerid} == ST_INIT) {
my $logdir = getrunnerlogdir($runnerid); my $logdir = getrunnerlogdir($runnerid);
# first, remove all lingering log & lock files # first, remove all lingering log & lock files
if((!cleardir($logdir) || !cleardir("$logdir/$LOCKDIR")) if(!cleardir($logdir)) {
&& $clearlocks) { logmsg "ERROR: $runnerid: cleardir($logdir) failed\n";
# On Windows, lock files can't be deleted when the process still
# has them open, so kill those processes first
if(runnerac_clearlocks($runnerid)) {
logmsg "ERROR: runner $runnerid seems to have died\n";
$singletest_state{$runnerid} = ST_INIT;
return (-1, 0);
} }
$singletest_state{$runnerid} = ST_CLEARLOCKS; if(!cleardir("$logdir/$LOCKDIR")) {
} else { logmsg "ERROR: $runnerid: cleardir($logdir/$LOCKDIR) failed\n";
}
$singletest_state{$runnerid} = ST_INITED; $singletest_state{$runnerid} = ST_INITED;
# Recursively call the state machine again because there is no # Recursively call the state machine again because there is no
# event expected that would otherwise trigger a new call. # event expected that would otherwise trigger a new call.
return singletest(@_); return singletest(@_);
}
} elsif($singletest_state{$runnerid} == ST_CLEARLOCKS) { } elsif($singletest_state{$runnerid} == ST_CLEARLOCKS) {
my ($rid, $logs) = runnerar($runnerid); my ($rid, $logs) = runnerar($runnerid);