mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:41:40 +03:00
CI: tidy up skipping tests build/run in Windows jobs
Simplify controlling whether to build and/run tests in a CI job. Apply the TFLAGS='skipall' (do not build nor run tests) or 'skiprun' (build, but do not run) method already used with old-mingw-w64 and msvc jobs to existing Windows jobs in GHA and AppVeyor. Also: - add Cygwin/cmake test build and run steps while here. - replace `DISABLED_TESTS` with `TFLAGS` in AppVeyor. Closes #13796
This commit is contained in:
parent
739ef9804d
commit
c29a20d465
3 changed files with 44 additions and 44 deletions
16
appveyor.sh
16
appveyor.sh
|
|
@ -53,7 +53,6 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
|
|||
"-DCURL_USE_SCHANNEL=${SCHANNEL}" \
|
||||
"-DHTTP_ONLY=${HTTP_ONLY}" \
|
||||
"-DBUILD_SHARED_LIBS=${SHARED}" \
|
||||
"-DBUILD_TESTING=${TESTING}" \
|
||||
"-DENABLE_WEBSOCKETS=${WEBSOCKETS:-}" \
|
||||
"-DCMAKE_UNITY_BUILD=${UNITY}" \
|
||||
'-DCURL_WERROR=ON' \
|
||||
|
|
@ -117,18 +116,23 @@ if false; then
|
|||
done
|
||||
fi
|
||||
|
||||
# test
|
||||
# build tests
|
||||
|
||||
if [ "${TESTING}" = 'ON' ]; then
|
||||
export TFLAGS=''
|
||||
if [[ "${TFLAGS}" != 'skipall' ]] && \
|
||||
[ "${BUILD_SYSTEM}" = 'CMake' ]; then
|
||||
cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target testdeps
|
||||
fi
|
||||
|
||||
# run tests
|
||||
|
||||
if [[ "${TFLAGS}" != 'skipall' ]] && \
|
||||
[[ "${TFLAGS}" != 'skiprun' ]]; then
|
||||
if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
|
||||
TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
|
||||
elif [ -x "$(cygpath 'C:/msys64/usr/bin/curl.exe')" ]; then
|
||||
TFLAGS+=" -ac $(cygpath 'C:/msys64/usr/bin/curl.exe')"
|
||||
fi
|
||||
TFLAGS+=" ${DISABLED_TESTS:-}"
|
||||
if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
|
||||
cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target testdeps
|
||||
ls _bld/lib/*.dll >/dev/null 2>&1 && cp -f -p _bld/lib/*.dll _bld/tests/libtest/
|
||||
cmake --build _bld --config "${PRJ_CFG}" --target test-ci
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue