mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:41:40 +03:00
appveyor: tidy-ups
- delete a duplicate line. - simplify a `make` call. - merge two `if` branches. - reorder autotools options for clarity. - add `--enable-warnings` where missing (it's also the default.) - add empty lines to YAML for readability. - use lowercase install prefix/directory. Closes #13598
This commit is contained in:
parent
7d8d25174c
commit
dad03dc593
2 changed files with 16 additions and 13 deletions
13
appveyor.sh
13
appveyor.sh
|
|
@ -39,7 +39,6 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
|
|||
options=''
|
||||
[[ "${TARGET:-}" = *'ARM64'* ]] && SKIP_RUN='ARM64 architecture'
|
||||
[ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}"
|
||||
[ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}"
|
||||
[ "${PRJ_CFG}" = 'Debug' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG='
|
||||
[ "${PRJ_CFG}" = 'Release' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE='
|
||||
[[ "${PRJ_GEN}" = *'Visual Studio'* ]] && options+=' -DCMAKE_VS_GLOBALS=TrackFileAccess=false'
|
||||
|
|
@ -57,7 +56,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
|
|||
'-DCURL_WERROR=ON' \
|
||||
"-DENABLE_DEBUG=${DEBUG}" \
|
||||
"-DENABLE_UNICODE=${ENABLE_UNICODE}" \
|
||||
'-DCMAKE_INSTALL_PREFIX=C:/CURL' \
|
||||
'-DCMAKE_INSTALL_PREFIX=C:/curl' \
|
||||
"-DCMAKE_BUILD_TYPE=${PRJ_CFG}"
|
||||
# shellcheck disable=SC2086
|
||||
cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --clean-first -- ${BUILD_OPT:-}
|
||||
|
|
@ -128,10 +127,6 @@ if false; then
|
|||
done
|
||||
fi
|
||||
|
||||
if [ "${TESTING}" = 'ON' ] && [ "${BUILD_SYSTEM}" = 'CMake' ]; then
|
||||
cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target testdeps
|
||||
fi
|
||||
|
||||
# test
|
||||
|
||||
if [ "${TESTING}" = 'ON' ]; then
|
||||
|
|
@ -143,13 +138,11 @@ if [ "${TESTING}" = 'ON' ]; then
|
|||
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
|
||||
elif [ "${BUILD_SYSTEM}" = 'autotools' ]; then
|
||||
(
|
||||
cd _bld
|
||||
make -j2 V=1 test-ci
|
||||
)
|
||||
make -C _bld -j2 V=1 test-ci
|
||||
else
|
||||
(
|
||||
TFLAGS="-a -p !flaky -r -rm ${TFLAGS}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue