diff options
| author | Ji Jyun-Neng <jijyunneng@gmail.com> | 2020-04-05 01:09:56 +0800 |
|---|---|---|
| committer | Ji Jyun-Neng <jijyunneng@gmail.com> | 2020-04-05 01:09:56 +0800 |
| commit | 879fd9b452991c6281753119e82013b64a66d202 (patch) | |
| tree | 6b4f13d19f7a6b403a7db8f11828f8b0ec6ef5e0 | |
| parent | 61f010d703b32de9bfb20ab90ece38ab2f25977f (diff) | |
| download | googletest-879fd9b452991c6281753119e82013b64a66d202.tar.gz googletest-879fd9b452991c6281753119e82013b64a66d202.tar.bz2 googletest-879fd9b452991c6281753119e82013b64a66d202.zip | |
Remove duplicate codes existed in get-nprocessors.sh
| -rwxr-xr-x | ci/travis.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ci/travis.sh b/ci/travis.sh index 9ff3bad3..5e935077 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -3,21 +3,6 @@ set -evx . ci/get-nprocessors.sh -# if possible, ask for the precise number of processors, -# otherwise take 2 processors as reasonable default; see -# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization -if [ -x /usr/bin/getconf ]; then - NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN) -else - NPROCESSORS=2 -fi -# as of 2017-09-04 Travis CI reports 32 processors, but GCC build -# crashes if parallelized too much (maybe memory consumption problem), -# so limit to 4 processors for the time being. -if [ $NPROCESSORS -gt 4 ] ; then - echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4." - NPROCESSORS=4 -fi # Tell make to use the processors. No preceding '-' required. MAKEFLAGS="j${NPROCESSORS}" export MAKEFLAGS |