commit 515d4f1e93bcf9160c8b41d5a90b3144388f706f parent eb427f309cbe2eb82769fdec4e9b7a7249c3287b Author: David Goulet <dgoulet@torproject.org> Date: Mon, 13 Jul 2020 15:03:34 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 Diffstat:
| M | Makefile.am | | | 3 | +-- |
| A | changes/ticket40030 | | | 7 | +++++++ |
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am @@ -274,8 +274,7 @@ check-local: \ check-changes \ check-includes \ check-best-practices \ - shellcheck \ - check-cocci + shellcheck # test-network requires a copy of Chutney in $CHUTNEY_PATH. # Chutney can be cloned from https://git.torproject.org/chutney.git . diff --git a/changes/ticket40030 b/changes/ticket40030 @@ -0,0 +1,7 @@ + o Removed features: + - Our "check-local" test target no longer tries to use the Coccinelle + semantic patching tool parse all the C files. While it is a good idea + to try to make sure Coccinelle works on our C before we run a + Coccinelle patch, doing so on every test run has proven to be disruptive. + You can still run this tool manually with "make check-cocci". Closes + ticket 40030.