diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2020-05-01 17:11:17 -0400 |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2020-05-01 17:11:17 -0400 |
| commit | b0e53e2d64db0f37ceb73984b9cfad6ad3577a87 (patch) | |
| tree | 766bd4d0bb4f418206b5cf343a513783893fc9f7 | |
| parent | 1b3eb6ef34620c1203263d76ec169ef0853789cc (diff) | |
| parent | 879fd9b452991c6281753119e82013b64a66d202 (diff) | |
| download | googletest-b0e53e2d64db0f37ceb73984b9cfad6ad3577a87.tar.gz googletest-b0e53e2d64db0f37ceb73984b9cfad6ad3577a87.tar.bz2 googletest-b0e53e2d64db0f37ceb73984b9cfad6ad3577a87.zip | |
Merge pull request #2797 from Jyun-Neng:master
PiperOrigin-RevId: 307604377
| -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 f37660bb..a2488229 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 |