diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-04 22:01:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 22:01:38 -0500 |
| commit | 6b4967a23aae2f6d63a356d1db8746cb5250be26 (patch) | |
| tree | e76ee1c2169a9551829d8fce649d393474d8dd2e /ci/travis.sh | |
| parent | b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9 (diff) | |
| parent | abbc0f8174d92b8a52dd893cf31be6f7af5d0de7 (diff) | |
| download | googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.tar.gz googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.tar.bz2 googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.zip | |
Merge branch 'master' into missing-declarations
Diffstat (limited to 'ci/travis.sh')
| -rwxr-xr-x | ci/travis.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/travis.sh b/ci/travis.sh index 24a557e9..2dda68fd 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -1,6 +1,8 @@ #!/usr/bin/env sh 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 |