diff options
| author | bors <bors@rust-lang.org> | 2015-08-13 16:09:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-13 16:09:22 +0000 |
| commit | 7b7fc67dd453c470a48dbdcf64693a93293c9ab0 (patch) | |
| tree | 200d501abb573634ea6643b7173e42d4c521730c | |
| parent | bb954cfa75ec63b2cf28229ecc4aee7024381d0b (diff) | |
| parent | 904e428dbadf9bd23a8ea1830fab100bc55a386f (diff) | |
Auto merge of #27625 - wthrowe:find, r=alexcrichton
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. I don't have access to a Windows development system to test this, so someone needs to verify that this actually works there before merging. Closes #19981.
| -rw-r--r-- | mk/tests.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index f91828838a8..d4206acd274 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -268,9 +268,10 @@ 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' \ + -and -not -name '*.sh' -and -not -name '*.pp' \ | grep '^$(S)src/jemalloc' -v \ | grep '^$(S)src/libuv' -v \ | grep '^$(S)src/llvm' -v \ |