From 543fa699c652b63798e6dfcbed627ec9ba125bb7 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 11:34:57 -0500 Subject: [PATCH 1/7] Use Travis to make sure all generated files are up to date --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 778030709acd41..36ca56d62fd9b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,6 +78,8 @@ before_script: fi ./configure --with-pydebug make -j4 + make -j4 regen-all clinic + test -z "`git status --porcelain`" script: # `-r -w` implicitly provided through `make buildbottest`. From d1471fae17769fd9d0ed96382118b7a0ed80f3ad Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 11:54:11 -0500 Subject: [PATCH 2/7] Force a compile error to see what Travis does... --- Objects/dictobject.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 808f548a90394e..63969dc1513d15 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -254,8 +254,6 @@ static int numfree = 0; static PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST]; static int numfreekeys = 0; -#include "clinic/dictobject.c.h" - int PyDict_ClearFreeList(void) { From 26710f517301481e3f7b67f58711ef037fbc03f5 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 12:00:56 -0500 Subject: [PATCH 3/7] Try explicit exits --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36ca56d62fd9b4..f3d36ec38f5ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,9 +77,9 @@ before_script: exit fi ./configure --with-pydebug - make -j4 - make -j4 regen-all clinic - test -z "`git status --porcelain`" + make -j4 || exit 1 + make -j4 regen-all clinic || exit 1 + test -z "`git status --porcelain`" || exit 1 script: # `-r -w` implicitly provided through `make buildbottest`. From 763310990c65307400cd1e3c8c44b40af28dc3e3 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 12:05:37 -0500 Subject: [PATCH 4/7] Revert "Force a compile error to see what Travis does..." This reverts commit d1471fae17769fd9d0ed96382118b7a0ed80f3ad. --- Objects/dictobject.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 63969dc1513d15..808f548a90394e 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -254,6 +254,8 @@ static int numfree = 0; static PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST]; static int numfreekeys = 0; +#include "clinic/dictobject.c.h" + int PyDict_ClearFreeList(void) { From 6f51f166b8e5a8ae35416fc386f2230bcc4fccab Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 12:10:46 -0500 Subject: [PATCH 5/7] Force a clinic update --- Modules/_ssl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index a79a7470d20a3a..88f5bb8c1d4b40 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -328,7 +328,6 @@ class _ssl._SSLSocket "PySSLSocket *" "&PySSLSocket_Type" class _ssl.MemoryBIO "PySSLMemoryBIO *" "&PySSLMemoryBIO_Type" class _ssl.SSLSession "PySSLSession *" "&PySSLSession_Type" [clinic start generated code]*/ -/*[clinic end generated code: output=da39a3ee5e6b4b0d input=bdc67fafeeaa8109]*/ #include "clinic/_ssl.c.h" From b98900ead58dfc1223054cc5ebf322d2b9f6bf3b Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 12:20:08 -0500 Subject: [PATCH 6/7] Try set -e; add message --- .travis.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3d36ec38f5ed6..5f9a38aaa482c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,15 +71,20 @@ matrix: # Travis provides only 2 cores, so don't overdo the parallelism and waste memory. before_script: - | + set -e if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.rst$)|(^Doc)|(^Misc)' then echo "Only docs were updated, stopping build process." exit fi ./configure --with-pydebug - make -j4 || exit 1 - make -j4 regen-all clinic || exit 1 - test -z "`git status --porcelain`" || exit 1 + make -j4 + make -j4 regen-all clinic + if ! test -z "`git status --porcelain`" + then + echo "Generated files not up to date" + exit 1 + fi script: # `-r -w` implicitly provided through `make buildbottest`. From 8cddaeecd47aa62800ff9bd4c15fd3ed54427767 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 10 Jun 2017 12:25:39 -0500 Subject: [PATCH 7/7] make clinic --- Modules/_ssl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 88f5bb8c1d4b40..a79a7470d20a3a 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -328,6 +328,7 @@ class _ssl._SSLSocket "PySSLSocket *" "&PySSLSocket_Type" class _ssl.MemoryBIO "PySSLMemoryBIO *" "&PySSLMemoryBIO_Type" class _ssl.SSLSession "PySSLSession *" "&PySSLSession_Type" [clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=bdc67fafeeaa8109]*/ #include "clinic/_ssl.c.h"