From: teor <teor@torproject.org>
Date: Thu, 9 Apr 2020 09:41:19 +0000 (+1000)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.4-rc~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ae0839ef24d303f77cec165df5223a66131567c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3

Remove check-best-practices from check-local in maint-0.4.3.
(The check-local jobs are all on separate lines in 0.4.3.)
---

1ae0839ef24d303f77cec165df5223a66131567c
diff --cc Makefile.am
index ac61a990fc,eaffbe41a4..8b55bf0e32
--- a/Makefile.am
+++ b/Makefile.am
@@@ -267,13 -245,7 +267,12 @@@ test: al
  shellcheck:
  	$(top_srcdir)/scripts/maint/checkShellScripts.sh
  
 -check-local: check-spaces check-changes check-includes shellcheck
 +check-local:					\
 +	check-spaces				\
 +	check-changes				\
 +	check-includes				\
- 	check-best-practices			\
 +	shellcheck				\
 +	check-cocci
  
  need-chutney-path:
  	@if test ! -d "$$CHUTNEY_PATH"; then \