From: Viktor Szakats <commit@vsz.me>
Date: Thu, 28 Nov 2024 23:32:44 +0000 (+0100)
Subject: GHA/windows: avoid libtool wrapper for test and server executables
X-Git-Tag: curl-8_11_1~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04184d45badeb45ce9166725a15f93742fb09770;p=thirdparty%2Fcurl.git

GHA/windows: avoid libtool wrapper for test and server executables

This makes `runtests.pl` run the final executables directly.
Before this patch it called the autotools/libtool wrapper tool, which
then called the final executables.

This solution was already used for `curl.exe`.

Applies to tests run in the `mingw, AM x86_64 c-ares U` job, which still
shows unexplained flakiness.

Also makes tests finish 45 seconds faster.

Ref: #14854
Follow-up to 1a2d38c47c7825ad4d993d10664a45be3e3bbb58 #15437
Closes #15662
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 413cd60371..c0334b40fe 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -290,7 +290,7 @@ jobs:
           else
             # avoid libtool's curl.exe wrapper
             mv bld/src/.libs/curl.exe bld/src/curl.exe
-            mv bld/lib/.libs/*.dll bld/src || true
+            cp bld/lib/.libs/*.dll bld/src || true
           fi
           find . -name '*.exe' -o -name '*.dll'
           if [ '${{ matrix.test }}' != 'uwp' ]; then  # curl: error initializing curl library
@@ -306,6 +306,17 @@ jobs:
           else
             make -C bld -j5 V=1 -C tests
           fi
+          if [ '${{ matrix.build }}' != 'cmake' ]; then
+            # avoid libtool's .exe wrappers
+            mv bld/tests/http/clients/.libs/*.exe bld/tests/http/clients
+            mv bld/tests/libtest/.libs/*.exe bld/tests/libtest
+            mv bld/tests/server/.libs/*.exe bld/tests/server
+            mv bld/tests/unit/.libs/*.exe bld/tests/unit || true
+            cp bld/lib/.libs/*.dll bld/tests/http/clients || true
+            cp bld/lib/.libs/*.dll bld/tests/libtest || true
+            cp bld/lib/.libs/*.dll bld/tests/server || true
+            cp bld/lib/.libs/*.dll bld/tests/unit || true
+          fi
 
       - name: 'install test prereqs'
         if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}