diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-07-13 15:04:13 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-07-13 15:04:13 -0400 |
| commit | 29a474294c968218576ec6d912a94b8187a1e47b (patch) | |
| tree | 46fe73fb3c2da80d107420eb3d4492e5a9722c95 | |
| parent | 02cff32d7947cd230b1dab299b29dec5315ea4b9 (diff) | |
| parent | 515d4f1e93bcf9160c8b41d5a90b3144388f706f (diff) | |
| download | tor-29a474294c968218576ec6d912a94b8187a1e47b.tar.gz tor-29a474294c968218576ec6d912a94b8187a1e47b.zip | |
Merge branch 'maint-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 711d2cc037..4b708af9e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -273,8 +273,7 @@ check-local: \ check-spaces \ check-changes \ check-includes \ - 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. |