From f001f9a73ec8e1625995e8c8a7b76dc5df77beed Mon Sep 17 00:00:00 2001 From: William Throwe Date: Mon, 10 Aug 2015 00:12:45 -0400 Subject: [PATCH 1/2] Make tidy-binaries find invocation work on Linux New enough find on Linux doesn't support "-perm +..." and suggests using "-perm /..." instead, but that doesn't work on Windows. Hopefully all platforms are happy with this expanded version. --- mk/tests.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mk/tests.mk b/mk/tests.mk index 9341166beb0b6..df490511c6b0c 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -267,7 +267,8 @@ tidy-basic: .PHONY: tidy-binaries tidy-binaries: @$(call E, check: binaries) - $(Q)find $(S)src -type f -perm +a+x \ + $(Q)find $(S)src -type f \ + \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ -not -name '*.rs' -and -not -name '*.py' \ -and -not -name '*.sh' \ | grep '^$(S)src/jemalloc' -v \ From 904e428dbadf9bd23a8ea1830fab100bc55a386f Mon Sep 17 00:00:00 2001 From: William Throwe Date: Wed, 12 Aug 2015 19:08:22 -0400 Subject: [PATCH 2/2] Whitelist .pp files in tidy-binaries Pretty-printed files sometimes start with #![some_feature], which looks like a shebang line and confuses Windows builds into thinking they are executables. --- mk/tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/tests.mk b/mk/tests.mk index df490511c6b0c..df3229bfa87bf 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -270,7 +270,7 @@ tidy-binaries: $(Q)find $(S)src -type f \ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ -not -name '*.rs' -and -not -name '*.py' \ - -and -not -name '*.sh' \ + -and -not -name '*.sh' -and -not -name '*.pp' \ | grep '^$(S)src/jemalloc' -v \ | grep '^$(S)src/libuv' -v \ | grep '^$(S)src/llvm' -v \