mirror of
https://github.com/XRPLF/rippled.git
synced 2026-04-29 15:37:57 +00:00
Improve Windows and MacOS test performance in Travis CI:
* Increases hard-coded number of parallel unit test processes for Windows and MacOS builds from 1 to 2. * Reduces Travis job time to well under the timeout value of 1.5 hours. * Continue using a hard-coded value rather than `nprocs` because higher values cause some jobs to run out of memory.
This commit is contained in:
committed by
manojsdoshi
parent
068db1f48b
commit
efa615a5e3
11
.travis.yml
11
.travis.yml
@@ -390,8 +390,8 @@ matrix:
|
||||
- mkdir -p build.ms && cd build.ms
|
||||
- cmake -G Ninja ${CMAKE_EXTRA_ARGS} -DCMAKE_BUILD_TYPE=${BLD_CONFIG} ..
|
||||
- travis_wait ${MAX_TIME_MIN} cmake --build . --parallel --verbose
|
||||
# override num procs to force single unit test job
|
||||
- export NUM_PROCESSORS=1
|
||||
# override num procs to force fewer unit test jobs
|
||||
- export NUM_PROCESSORS=2
|
||||
- travis_wait ${MAX_TIME_MIN} ./rippled.exe --unittest --quiet --unittest-log --unittest-jobs ${NUM_PROCESSORS}
|
||||
- <<: *windows-bld
|
||||
name: windows, release
|
||||
@@ -404,8 +404,8 @@ matrix:
|
||||
- cmake -G "Visual Studio 15 2017 Win64" ${CMAKE_EXTRA_ARGS} ..
|
||||
- export DESTDIR=${PWD}/_installed_
|
||||
- travis_wait ${MAX_TIME_MIN} cmake --build . --parallel --verbose --config ${BLD_CONFIG} --target install
|
||||
# override num procs to force single unit test job
|
||||
- export NUM_PROCESSORS=1
|
||||
# override num procs to force fewer unit test jobs
|
||||
- export NUM_PROCESSORS=2
|
||||
- >-
|
||||
travis_wait ${MAX_TIME_MIN} "./_installed_/Program Files/rippled/bin/rippled.exe" --unittest --quiet --unittest-log --unittest-jobs ${NUM_PROCESSORS}
|
||||
- <<: *windows-bld
|
||||
@@ -438,8 +438,7 @@ cache:
|
||||
- $CACHE_DIR
|
||||
|
||||
before_install:
|
||||
# NUM_PROCESSORS was set to 1 due to problems in parallel launch of unit tests on Mac platform
|
||||
- if [ "$(uname)" = "Darwin" ] ; then export NUM_PROCESSORS=1; else export NUM_PROCESSORS=$(nproc); fi
|
||||
- export NUM_PROCESSORS=$(nproc)
|
||||
- echo "NUM PROC is ${NUM_PROCESSORS}"
|
||||
- if [ "$(uname)" = "Linux" ] ; then docker pull ${DOCKER_IMAGE}; fi
|
||||
- if [ "${MATRIX_EVAL}" != "" ] ; then eval "${MATRIX_EVAL}"; fi
|
||||
|
||||
Reference in New Issue
Block a user