From e79b366c73f0aa79a14447041ae96e50e9fcb2f2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 18:09:02 +0100
Subject: [PATCH 01/13] do not install handle64 on msys builds

---
 .github/workflows/windows.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 60f0fb2965..0f1fc7ec6c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -328,7 +328,9 @@ jobs:
         timeout-minutes: 5
         run: |
           /c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
-          curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 https://live.sysinternals.com/handle64.exe --output /bin/handle64.exe
+          if [ '${{ matrix.sys }}' != 'msys' ]; then
+            curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 https://live.sysinternals.com/handle64.exe --output /bin/handle64.exe
+          fi
 
       - name: 'run tests'
         if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}

From d36066691a6bd47c3e970a06a5a9f6d5262cd903 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 18:11:39 +0100
Subject: [PATCH 02/13] ci: stop installing handle64

---
 .github/workflows/windows.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0f1fc7ec6c..8d651a20a7 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -328,9 +328,6 @@ jobs:
         timeout-minutes: 5
         run: |
           /c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
-          if [ '${{ matrix.sys }}' != 'msys' ]; then
-            curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 https://live.sysinternals.com/handle64.exe --output /bin/handle64.exe
-          fi
 
       - name: 'run tests'
         if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -480,7 +477,6 @@ jobs:
         timeout-minutes: 5
         run: |
           /c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
-          curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 https://live.sysinternals.com/handle64.exe --output /bin/handle64.exe
           python3 -m pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary impacket
 
       - name: 'downgrade msys2-runtime'
@@ -886,7 +882,6 @@ jobs:
           if [[ '${{ matrix.name }}' != *'gnutls'* ]]; then
             /c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel openssh || true
           fi
-          curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 https://live.sysinternals.com/handle64.exe --output /bin/handle64.exe
           python3 -m pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary impacket
 
       - name: 'downgrade msys2-runtime'

From fcc33071e5ac9af5a1730b959cedcc8ac5778b1c Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 18:13:38 +0100
Subject: [PATCH 03/13] runtests: stop calling handle64

---
 tests/runner.pm  |  2 --
 tests/servers.pm | 49 ------------------------------------------------
 2 files changed, 51 deletions(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index 68f3969cd0..25c1673d75 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -88,7 +88,6 @@ use processhelp qw(
     );
 use servers qw(
     checkcmd
-    clearlocks
     initserverconfig
     serverfortest
     stopserver
@@ -1518,7 +1517,6 @@ sub runner_clearlocks {
     if(clearlogs()) {
         logmsg "Warning: log messages were lost\n";
     }
-    clearlocks($lockdir);
     return clearlogs();
 }
 
diff --git a/tests/servers.pm b/tests/servers.pm
index 7d644eed59..35c637141c 100644
--- a/tests/servers.pm
+++ b/tests/servers.pm
@@ -54,7 +54,6 @@ BEGIN {
         # functions
         qw(
             checkcmd
-            clearlocks
             serverfortest
             stopserver
             stopservers
@@ -265,54 +264,6 @@ sub init_serverpidfile_hash {
 }
 
 
-#######################################################################
-# Kill the processes that still have lock files in a directory
-#
-sub clearlocks {
-    my $dir = $_[0];
-    my $done = 0;
-
-    if(os_is_win()) {
-        $dir = sys_native_abs_path($dir);
-        # Must use backslashes for handle64 to find a match
-        if ($^O eq 'MSWin32') {
-            $dir =~ s/\//\\/g;
-        }
-        else {
-            $dir =~ s/\//\\\\/g;
-        }
-        my $handle = "handle";
-        if($ENV{"PROCESSOR_ARCHITECTURE"} =~ /64$/) {
-            $handle = "handle64";
-        }
-        if(checkcmd($handle)) {
-            # https://learn.microsoft.com/sysinternals/downloads/handle#usage
-            my $cmd = "$handle $dir -accepteula -nobanner";
-            logmsg "clearlocks: Executing query: '$cmd'\n";
-            my @handles = `$cmd`;
-            for my $tryhandle (@handles) {
-                # Skip the "No matching handles found." warning when returned
-                if($tryhandle =~ /^(\S+)\s+pid:\s+(\d+)\s+type:\s+(\w+)\s+([0-9A-F]+):\s+(.+)\r\r/) {
-                    logmsg "clearlocks: Found $3 lock of '$5' ($4) by $1 ($2)\n";
-                    # Ignore stunnel since we cannot do anything about its locks
-                    if("$3" eq "File" && "$1" ne "tstunnel.exe") {
-                        logmsg "clearlocks: Killing IMAGENAME eq $1 and PID eq $2\n";
-                        # https://ss64.com/nt/taskkill.html
-                        my $cmd = "taskkill.exe -f -t -fi \"IMAGENAME eq $1\" -fi \"PID eq $2\" >nul 2>&1";
-                        logmsg "clearlocks: Executing kill: '$cmd'\n";
-                        system($cmd);
-                        $done = 1;
-                    }
-                }
-            }
-        }
-        else {
-            logmsg "Warning: 'handle' tool not found.\n";
-        }
-    }
-    return $done;
-}
-
 #######################################################################
 # Check if a given child process has just died. Reaps it if so.
 #

From 520bec169a155b5fff8f7ee586b32fe26faaadcd Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 18:16:31 +0100
Subject: [PATCH 04/13] runtests: drop upper-level calls to handle64

---
 tests/runner.pm   | 22 +---------------------
 tests/runtests.pl |  7 -------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index 25c1673d75..a47a769af8 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -47,7 +47,6 @@ BEGIN {
         readtestkeywords
         restore_test_env
         runner_init
-        runnerac_clearlocks
         runnerac_shutdown
         runnerac_stopservers
         runnerac_test_preprocess
@@ -1274,12 +1273,6 @@ sub runner_test_run {
     return (0, clearlogs(), \%testtimings, $cmdres, $CURLOUT, $tool, $usedvalgrind);
 }
 
-# Async call runner_clearlocks
-# Called by controller
-sub runnerac_clearlocks {
-    return controlleripccall(\&runner_clearlocks, @_);
-}
-
 # Async call runner_shutdown
 # This call does NOT generate an IPC response and must be the last IPC call
 # received.
@@ -1473,10 +1466,7 @@ sub ipcrecv {
     # print "ipcrecv $funcname\n";
     # Synchronously call the desired function
     my @res;
-    if($funcname eq "runner_clearlocks") {
-        @res = runner_clearlocks(@$argsarrayref);
-    }
-    elsif($funcname eq "runner_shutdown") {
+    if($funcname eq "runner_shutdown") {
         runner_shutdown(@$argsarrayref);
         # Special case: no response will be forthcoming
         return 1;
@@ -1510,16 +1500,6 @@ sub ipcrecv {
     return 0;
 }
 
-###################################################################
-# Kill the server processes that still have lock files in a directory
-sub runner_clearlocks {
-    my ($lockdir)=@_;
-    if(clearlogs()) {
-        logmsg "Warning: log messages were lost\n";
-    }
-    return clearlogs();
-}
-
 
 ###################################################################
 # Kill all server processes
diff --git a/tests/runtests.pl b/tests/runtests.pl
index a45d12f084..17c153a45c 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1839,13 +1839,6 @@ sub singletest {
         # first, remove all lingering log & lock files
         if((!cleardir($logdir) || !cleardir("$logdir/$LOCKDIR"))
             && $clearlocks) {
-            # On Windows, lock files can't be deleted when the process still
-            # has them open, so kill those processes first
-            if(runnerac_clearlocks($runnerid, "$logdir/$LOCKDIR")) {
-                logmsg "ERROR: runner $runnerid seems to have died\n";
-                $singletest_state{$runnerid} = ST_INIT;
-                return (-1, 0);
-            }
             $singletest_state{$runnerid} = ST_CLEARLOCKS;
         } else {
             $singletest_state{$runnerid} = ST_INITED;

From 17fea1342cdfa6676157f93e124d425d7c18729b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 18:33:33 +0100
Subject: [PATCH 05/13] Revert "runtests: drop upper-level calls to handle64"

This reverts commit e5e5c090cf91c34ef7c7a79d8e5e3160b91f610d.

Some of the logic don't seem to be Windows-specific or handle64-related,
as most of the CI test fail to complete in time (hang?) when removing it:
https://github.com/curl/curl/actions/runs/13527054998/job/37800227765?pr=16484 (macOS)
https://github.com/curl/curl/actions/runs/13527054994/job/37800178091?pr=16484 (BSDs)
https://github.com/curl/curl/actions/runs/13527054982/job/37800212082?pr=16484 (Windows)
---
 tests/runner.pm   | 22 +++++++++++++++++++++-
 tests/runtests.pl |  7 +++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index a47a769af8..25c1673d75 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -47,6 +47,7 @@ BEGIN {
         readtestkeywords
         restore_test_env
         runner_init
+        runnerac_clearlocks
         runnerac_shutdown
         runnerac_stopservers
         runnerac_test_preprocess
@@ -1273,6 +1274,12 @@ sub runner_test_run {
     return (0, clearlogs(), \%testtimings, $cmdres, $CURLOUT, $tool, $usedvalgrind);
 }
 
+# Async call runner_clearlocks
+# Called by controller
+sub runnerac_clearlocks {
+    return controlleripccall(\&runner_clearlocks, @_);
+}
+
 # Async call runner_shutdown
 # This call does NOT generate an IPC response and must be the last IPC call
 # received.
@@ -1466,7 +1473,10 @@ sub ipcrecv {
     # print "ipcrecv $funcname\n";
     # Synchronously call the desired function
     my @res;
-    if($funcname eq "runner_shutdown") {
+    if($funcname eq "runner_clearlocks") {
+        @res = runner_clearlocks(@$argsarrayref);
+    }
+    elsif($funcname eq "runner_shutdown") {
         runner_shutdown(@$argsarrayref);
         # Special case: no response will be forthcoming
         return 1;
@@ -1500,6 +1510,16 @@ sub ipcrecv {
     return 0;
 }
 
+###################################################################
+# Kill the server processes that still have lock files in a directory
+sub runner_clearlocks {
+    my ($lockdir)=@_;
+    if(clearlogs()) {
+        logmsg "Warning: log messages were lost\n";
+    }
+    return clearlogs();
+}
+
 
 ###################################################################
 # Kill all server processes
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 17c153a45c..a45d12f084 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1839,6 +1839,13 @@ sub singletest {
         # first, remove all lingering log & lock files
         if((!cleardir($logdir) || !cleardir("$logdir/$LOCKDIR"))
             && $clearlocks) {
+            # On Windows, lock files can't be deleted when the process still
+            # has them open, so kill those processes first
+            if(runnerac_clearlocks($runnerid, "$logdir/$LOCKDIR")) {
+                logmsg "ERROR: runner $runnerid seems to have died\n";
+                $singletest_state{$runnerid} = ST_INIT;
+                return (-1, 0);
+            }
             $singletest_state{$runnerid} = ST_CLEARLOCKS;
         } else {
             $singletest_state{$runnerid} = ST_INITED;

From d7a9bc6637e5e7d0752f5f4cb9c93f0a45729a34 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 18:40:06 +0100
Subject: [PATCH 06/13] delete unused argument try 1

---
 tests/runner.pm   | 3 +--
 tests/runtests.pl | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index 25c1673d75..efe5681bcc 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -1277,7 +1277,7 @@ sub runner_test_run {
 # Async call runner_clearlocks
 # Called by controller
 sub runnerac_clearlocks {
-    return controlleripccall(\&runner_clearlocks, @_);
+    return controlleripccall(\&runner_clearlocks);
 }
 
 # Async call runner_shutdown
@@ -1513,7 +1513,6 @@ sub ipcrecv {
 ###################################################################
 # Kill the server processes that still have lock files in a directory
 sub runner_clearlocks {
-    my ($lockdir)=@_;
     if(clearlogs()) {
         logmsg "Warning: log messages were lost\n";
     }
diff --git a/tests/runtests.pl b/tests/runtests.pl
index a45d12f084..249a146427 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1841,7 +1841,7 @@ sub singletest {
             && $clearlocks) {
             # On Windows, lock files can't be deleted when the process still
             # has them open, so kill those processes first
-            if(runnerac_clearlocks($runnerid, "$logdir/$LOCKDIR")) {
+            if(runnerac_clearlocks($runnerid)) {
                 logmsg "ERROR: runner $runnerid seems to have died\n";
                 $singletest_state{$runnerid} = ST_INIT;
                 return (-1, 0);

From dbc33efdf66a3de1f5e49320b844b87bec6f14da Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 11:17:12 +0100
Subject: [PATCH 07/13] try ci without -rm

---
 appveyor.sh          | 2 +-
 tests/CMakeLists.txt | 2 +-
 tests/Makefile.am    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.sh b/appveyor.sh
index ed1bf83058..1b49eb6d90 100644
--- a/appveyor.sh
+++ b/appveyor.sh
@@ -145,7 +145,7 @@ if [ "${TFLAGS}" != 'skipall' ] && \
     cmake --build _bld --config "${PRJ_CFG}" --target test-ci
   else
     (
-      TFLAGS="-a -p !flaky -r -rm ${TFLAGS}"
+      TFLAGS="-a -p !flaky -r ${TFLAGS}"
       cd _bld/tests
       ./runtests.pl
     )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 47b01a3fac..e7037e866d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -107,7 +107,7 @@ curl_add_runtests(test-am        "-a -am")
 curl_add_runtests(test-full      "-a -p -r")
 # ~flaky means that it ignores results of tests using the flaky keyword
 curl_add_runtests(test-nonflaky  "-a -p ~flaky ~timing-dependent")
-curl_add_runtests(test-ci        "-a -p ~flaky ~timing-dependent -r -rm -j20")
+curl_add_runtests(test-ci        "-a -p ~flaky ~timing-dependent -r -j20")
 curl_add_runtests(test-torture   "-a -t -j20")
 curl_add_runtests(test-event     "-a -e")
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 46d58fed85..ac8b26cb88 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -145,7 +145,7 @@ TEST_E = -a -e
 TEST_NF = -a -p ~flaky ~timing-dependent
 
 # special CI target derived from nonflaky with CI-specific flags
-TEST_CI = $(TEST_NF) -r -rm -j20
+TEST_CI = $(TEST_NF) -r -j20
 
 PYTEST = pytest
 endif

From 2e1f8de611dc85f252d8a3144b8a0fd42164639f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 15:22:16 +0100
Subject: [PATCH 08/13] runtests: drop -rm option

---
 tests/runtests.md | 5 -----
 tests/runtests.pl | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/tests/runtests.md b/tests/runtests.md
index 01b9182638..213a4bd4cd 100644
--- a/tests/runtests.md
+++ b/tests/runtests.md
@@ -219,11 +219,6 @@ Display run time statistics. (Requires the `Perl Time::HiRes` module)
 
 Display full run time statistics. (Requires the `Perl Time::HiRes` module)
 
-## `-rm`
-
-Force removal of files by killing locking processes. (Windows only, requires
-the **Sysinternals** `handle[64].exe` to be on PATH)
-
 ## `--repeat=[num]`
 
 This repeats the given set of test numbers this many times. If no test numbers
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 249a146427..49d5dd00d9 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2422,10 +2422,6 @@ while(@ARGV) {
             $fullstats=1;
         }
     }
-    elsif($ARGV[0] eq "-rm") {
-        # force removal of files by killing locking processes
-        $clearlocks=1;
-    }
     elsif($ARGV[0] eq "-u") {
         # error instead of warning on server unexpectedly alive
         $err_unexpected=1;
@@ -2459,7 +2455,6 @@ Usage: runtests.pl [options] [test selection(s)]
   -R       scrambled order (uses the random seed, see --seed)
   -r       run time statistics
   -rf      full run time statistics
-  -rm      force removal of files by killing locking processes (Windows only)
   --repeat=[num] run the given tests this many times
   -s       short output
   --seed=[num] set the random seed to a fixed number

From b12b0a7478067fc439fb69d368a2c207d02e3d16 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 15:27:50 +0100
Subject: [PATCH 09/13] runtests.pl: drop unused $clearlocks flag and logic

---
 tests/runtests.pl | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 49d5dd00d9..ea2050a5c5 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -179,7 +179,6 @@ my %runnersrunning;    # tests currently running by runner ID
 my $short;
 my $no_debuginfod;
 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 $run_disabled; # run the specific tests even if listed in DISABLED
 my $scrambleorder;
@@ -1837,22 +1836,17 @@ sub singletest {
     if($singletest_state{$runnerid} == ST_INIT) {
         my $logdir = getrunnerlogdir($runnerid);
         # first, remove all lingering log & lock files
-        if((!cleardir($logdir) || !cleardir("$logdir/$LOCKDIR"))
-            && $clearlocks) {
-            # 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;
-        } else {
-            $singletest_state{$runnerid} = ST_INITED;
-            # Recursively call the state machine again because there is no
-            # event expected that would otherwise trigger a new call.
-            return singletest(@_);
+        if(!cleardir($logdir)) {
+            logmsg "ERROR: $runnerid: cleardir($logdir) failed\n";
         }
+        if(!cleardir("$logdir/$LOCKDIR")) {
+            logmsg "ERROR: $runnerid: cleardir($logdir/$LOCKDIR) failed\n";
+        }
+
+        $singletest_state{$runnerid} = ST_INITED;
+        # Recursively call the state machine again because there is no
+        # event expected that would otherwise trigger a new call.
+        return singletest(@_);
 
     } elsif($singletest_state{$runnerid} == ST_CLEARLOCKS) {
         my ($rid, $logs) = runnerar($runnerid);

From b2eb7312d3677368d786de2afd2da43e4e2ac1cb Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 15:29:33 +0100
Subject: [PATCH 10/13] runtests.pl: drop unused ST_CLEARLOCKS status

---
 tests/runtests.pl | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/runtests.pl b/tests/runtests.pl
index ea2050a5c5..e8ae7d6695 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -160,7 +160,6 @@ my $globalabort; # flag signalling program abort
 # values for $singletest_state
 use constant {
     ST_INIT => 0,
-    ST_CLEARLOCKS => 1,
     ST_INITED => 2,
     ST_PREPROCESS => 3,
     ST_RUN => 4,
@@ -1848,21 +1847,6 @@ sub singletest {
         # event expected that would otherwise trigger a new call.
         return singletest(@_);
 
-    } elsif($singletest_state{$runnerid} == ST_CLEARLOCKS) {
-        my ($rid, $logs) = runnerar($runnerid);
-        if(!$rid) {
-            logmsg "ERROR: runner $runnerid seems to have died\n";
-            $singletest_state{$runnerid} = ST_INIT;
-            return (-1, 0);
-        }
-        logmsg $logs;
-        my $logdir = getrunnerlogdir($runnerid);
-        cleardir($logdir);
-        $singletest_state{$runnerid} = ST_INITED;
-        # Recursively call the state machine again because there is no
-        # event expected that would otherwise trigger a new call.
-        return singletest(@_);
-
     } elsif($singletest_state{$runnerid} == ST_INITED) {
         ###################################################################
         # Restore environment variables that were modified in a previous run.

From c8c5877f39a5ec9bee0bc8c0332911a7667842d3 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 15:30:46 +0100
Subject: [PATCH 11/13] runtests: drop unused runnerac_clearlocks

---
 tests/runner.pm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index efe5681bcc..fa15accda3 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -47,7 +47,6 @@ BEGIN {
         readtestkeywords
         restore_test_env
         runner_init
-        runnerac_clearlocks
         runnerac_shutdown
         runnerac_stopservers
         runnerac_test_preprocess
@@ -1274,12 +1273,6 @@ sub runner_test_run {
     return (0, clearlogs(), \%testtimings, $cmdres, $CURLOUT, $tool, $usedvalgrind);
 }
 
-# Async call runner_clearlocks
-# Called by controller
-sub runnerac_clearlocks {
-    return controlleripccall(\&runner_clearlocks);
-}
-
 # Async call runner_shutdown
 # This call does NOT generate an IPC response and must be the last IPC call
 # received.

From 870a3fa6c6fa027e96e407d29e8212e01e2f289a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 15:31:25 +0100
Subject: [PATCH 12/13] runtests: drop unused runner_clearlocks

---
 tests/runner.pm | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index fa15accda3..48f5734763 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -1466,10 +1466,7 @@ sub ipcrecv {
     # print "ipcrecv $funcname\n";
     # Synchronously call the desired function
     my @res;
-    if($funcname eq "runner_clearlocks") {
-        @res = runner_clearlocks(@$argsarrayref);
-    }
-    elsif($funcname eq "runner_shutdown") {
+    if($funcname eq "runner_shutdown") {
         runner_shutdown(@$argsarrayref);
         # Special case: no response will be forthcoming
         return 1;
@@ -1503,16 +1500,6 @@ sub ipcrecv {
     return 0;
 }
 
-###################################################################
-# Kill the server processes that still have lock files in a directory
-sub runner_clearlocks {
-    if(clearlogs()) {
-        logmsg "Warning: log messages were lost\n";
-    }
-    return clearlogs();
-}
-
-
 ###################################################################
 # Kill all server processes
 sub runner_stopservers {

From 752740c82e0b05e91b0da6db91948dab077552c4 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 26 Feb 2025 16:05:18 +0100
Subject: [PATCH 13/13] tone down to warning

```
CUSTOMBUILD : error : 169: cleardir(log/8/lock) failed [D:\a\curl\curl\bld\tests\test-ci.vcxproj]
```
https://github.com/curl/curl/actions/runs/13546192228/job/37858323380?pr=16484#step:14:177

Seems to happen consistently in every vcpkg job, once, around the beginning.

```
CUSTOMBUILD : error : 323: cleardir(log/8/lock) failed [D:\a\curl\curl\bld\tests\test-ci.vcxproj]
CUSTOMBUILD : error : 1176: cleardir(log/8/lock) failed [D:\a\curl\curl\bld\tests\test-ci.vcxproj]
CUSTOMBUILD : error : 752: cleardir(log/8/lock) failed [D:\a\curl\curl\bld\tests\test-ci.vcxproj]
```
---
 tests/runtests.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/runtests.pl b/tests/runtests.pl
index e8ae7d6695..13c840476f 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1836,10 +1836,10 @@ sub singletest {
         my $logdir = getrunnerlogdir($runnerid);
         # first, remove all lingering log & lock files
         if(!cleardir($logdir)) {
-            logmsg "ERROR: $runnerid: cleardir($logdir) failed\n";
+            logmsg "Warning: $runnerid: cleardir($logdir) failed\n";
         }
         if(!cleardir("$logdir/$LOCKDIR")) {
-            logmsg "ERROR: $runnerid: cleardir($logdir/$LOCKDIR) failed\n";
+            logmsg "Warning: $runnerid: cleardir($logdir/$LOCKDIR) failed\n";
         }
 
         $singletest_state{$runnerid} = ST_INITED;