summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-07-13 15:03:34 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-07-13 15:03:34 -0400
commit515d4f1e93bcf9160c8b41d5a90b3144388f706f (patch)
treeb7d039f8c2030186d99eddba0160264fb99c191a
parenteb427f309cbe2eb82769fdec4e9b7a7249c3287b (diff)
parent0acc3ae87904ca5d9bd430a5a89f89dd97f9ec85 (diff)
downloadtor-515d4f1e93bcf9160c8b41d5a90b3144388f706f.tar.gz
tor-515d4f1e93bcf9160c8b41d5a90b3144388f706f.zip
Merge branch 'maint-0.4.3' into maint-0.4.4
-rw-r--r--Makefile.am3
-rw-r--r--changes/ticket400307
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.