The intrduction of a %zu in datapath/flow_netlink.c with commit c1fc1411
revealed a problem with out-of-tree builds.
printf-check and thread-safety-check skip some directories with a 'grep -v'.
In the case of and out-of-tree build, the grep -v pattern doesn't work, because
it assumes the pathnames to be relative to the OVS root directory.
This commit fixes the problem by changing the directory before executing any
commands, like we do elsewhere in Makefile.am
Signed-off-by: Daniele Di Proietto <ddiproie...@vmware.com>
---
Makefile.am | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a98541f..d479c8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -208,8 +208,9 @@ config-h-check:
# Check for printf() type modifiers that MSVC doesn't support.
ALL_LOCAL += printf-check
printf-check:
- @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
- git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not
-e 'ovs_scan' `git ls-files $(srcdir) | grep '\.[ch]$$' | \
+ @cd $(srcdir); \
+ if test -e .git && (git --version) >/dev/null 2>&1 && \
+ git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not
-e 'ovs_scan' `git ls-files | grep '\.[ch]$$' | \
grep -vE '^datapath|^lib/sflow|^third-party'`; \
then \
echo "See above for list of violations of the rule that"; \
@@ -246,9 +247,10 @@ check-assert-h-usage:
ALL_LOCAL += thread-safety-check
thread-safety-check:
- @if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \
- grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \
- `git ls-files '$(srcdir)' | grep '\.[ch]$$' \
+ @cd $(srcdir); \
+ if test -e .git && (git --version) >/dev/null 2>&1 && \
+ grep -n -f build-aux/thread-safety-blacklist \
+ `git ls-files | grep '\.[ch]$$' \
| $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \
| $(EGREP) -v ':[ ]*/?\*'; \
then \
--
2.0.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
