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 1a2d38c47c #15437
Closes #15662
This commit is contained in:
parent
4ded2e0ac8
commit
04184d45ba
13
.github/workflows/windows.yml
vendored
13
.github/workflows/windows.yml
vendored
@ -290,7 +290,7 @@ jobs:
|
|||||||
else
|
else
|
||||||
# avoid libtool's curl.exe wrapper
|
# avoid libtool's curl.exe wrapper
|
||||||
mv bld/src/.libs/curl.exe bld/src/curl.exe
|
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
|
fi
|
||||||
find . -name '*.exe' -o -name '*.dll'
|
find . -name '*.exe' -o -name '*.dll'
|
||||||
if [ '${{ matrix.test }}' != 'uwp' ]; then # curl: error initializing curl library
|
if [ '${{ matrix.test }}' != 'uwp' ]; then # curl: error initializing curl library
|
||||||
@ -306,6 +306,17 @@ jobs:
|
|||||||
else
|
else
|
||||||
make -C bld -j5 V=1 -C tests
|
make -C bld -j5 V=1 -C tests
|
||||||
fi
|
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'
|
- name: 'install test prereqs'
|
||||||
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
|
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user