[libvirt] [PATCH] maint: exempt graphic binaries from syntax check

[Martin Kletzander]

On Tue, Jun 10, 2014 at 01:39:03PM -0600, Eric Blake wrote:
>Roman Bogorodskiy reported a syntax-check failure when using
>FreeBSD; complaining that:
>
>prohibit_empty_first_line
>tools/libvirt_win_icon_16x16.ico:1:
>tools/libvirt_win_icon_32x32.ico:1:
>tools/libvirt_win_icon_48x48.ico:1:
>tools/libvirt_win_icon_64x64.ico:1:
>maint.mk: Prohibited empty first line
>
>In reality, the first 'line' of that file is NOT empty; but since
>it is a binary file, awk is not required to handle it gracefully.
>The simplest solution is to exempt all image files from syntax
>checks in the first place - after all, we only store them in git
>because they are inconvenient to regenerate, but they are not our
>preferred format for making modifications, and syntax check should
>only cover files that we are likely to modify.
>
>* cfg.mk (VC_LIST_ALWAYS_EXCLUDE_REGEX): Exempt images.
>(exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF): Simplify.
>(exclude_file_name_regexp--sc_trailing_blank): Likewise.
>

ACK

>Signed-off-by: Eric Blake <eblake at redhat.com>
>---
> cfg.mk | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/cfg.mk b/cfg.mk
>index 10ad744..1f07639 100644
>--- a/cfg.mk
>+++ b/cfg.mk
>@@ -90,7 +90,7 @@ endif
>
> # Files that should never cause syntax check failures.
> VC_LIST_ALWAYS_EXCLUDE_REGEX = \
>-  (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.po)$$
>+  (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.(po|fig|gif|ico|png))$$
>
> # Functions like free() that are no-ops on NULL arguments.
> useless_free_options =				\
>@@ -1047,7 +1047,7 @@ exclude_file_name_regexp--sc_prohibit_close = \
>   (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vir(cgroup|pci)mock\.c)$$)
>
> exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
>-  (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.(gif|ico|png|diff)$$)
>+  (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.diff$$)
>
> _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
> exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
>@@ -1093,7 +1093,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \
> 	^(examples/|tools/virsh-edit\.c$$)
>
> exclude_file_name_regexp--sc_trailing_blank = \
>-  (/qemuhelpdata/|/sysinfodata/.*\.data|\.(fig|gif|ico|png)$$)
>+  /qemuhelpdata/|/sysinfodata/.*\.data$$
>
> exclude_file_name_regexp--sc_unmarked_diagnostics = \
>   ^(docs/apibuild.py|tests/virt-aa-helper-test)$$
>--
>1.9.3
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140611/c8f53967/attachment-0001.sig>