From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 6 Jun 2017 01:03:05 +0000 (-0500)
Subject: [2.7] bpo-30417: Disable 'cpu' resource on Travis (GH-1928)
X-Git-Tag: v2.7.14rc1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddf8f141f0181f9cac05c87383ea60887acffaec;p=thirdparty%2FPython%2Fcpython.git

[2.7] bpo-30417: Disable 'cpu' resource on Travis (GH-1928)

Also weakens the 'should this be run?' regex to allow all builds when .travis.yml changes.
(cherry picked from commit c53b13b270767948fddb58b287149c499f9a03c4)
---

diff --git a/.travis.yml b/.travis.yml
index 5bb4ce6f365b..967325482802 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,10 +40,10 @@ matrix:
       script:
         - make check suspicious html SPHINXOPTS="-q -W -j4"
 
-# Travis provides only 2 cores, so don't overdue the parallelism and waste memory.
+# Travis provides only 2 cores, so don't overdo the parallelism and waste memory.
 before_script:
   - |
-      if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)/'
+      if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.rst$)|(^Doc)'
       then
         echo "Only docs were updated, stopping build process."
         exit
@@ -53,7 +53,7 @@ before_script:
 
 script:
   # `-r -w` implicitly provided through `make buildbottest`.
-  - make buildbottest TESTOPTS="-j4"
+  - make buildbottest TESTOPTS="-j4 -uall,-cpu"
 
 notifications:
   email: false