diff options
author | David Goulet <dgoulet@torproject.org> | 2020-07-13 15:03:53 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2020-07-13 15:03:53 -0400 |
commit | a5a6d470810635f06d3457cf315433c0df1f0ae3 (patch) | |
tree | 9e9e1204ec8bcbb8d5e23d2c3b16b551608cbd35 | |
parent | 78bbbd9035284f81d8ea2dfed87729ed20e855b1 (diff) | |
parent | 515d4f1e93bcf9160c8b41d5a90b3144388f706f (diff) | |
download | tor-a5a6d470810635f06d3457cf315433c0df1f0ae3.tar.gz tor-a5a6d470810635f06d3457cf315433c0df1f0ae3.zip |
Merge branch 'maint-0.4.4' into release-0.4.4
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | changes/ticket40030 | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 1a1fa9b658..8a26c6403b 100644 --- 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 new file mode 100644 index 0000000000..c5f3ca4ff9 --- /dev/null +++ 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. |