NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cfg.mk: join not_streq and not_strneq tests

Browse Source 
The marginally nicer error message is not worth the extra lines in
cfg.mk.

Also drop the excludes since there was only one offender in the tests.
This commit is contained in:
Ján Tomko
2016-06-16 14:16:43 +02:00
parent b3e3fc3257
commit f9785569de
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cfg.mk
View File

@@ -986,13 +986,8 @@ sc_prohibit_pthread_create:
$(_sc_search_regexp) $(_sc_search_regexp)
sc_prohibit_not_streq: sc_prohibit_not_streq:
@prohibit='! *STREQ *\(.*\)' \ @prohibit='! *STRN?EQ *\(.*\)' \
halt='Use STRNEQ instead of !STREQ' \ halt='Use STRNEQ instead of !STREQ and STREQ instead of !STRNEQ' \
$(_sc_search_regexp)
sc_prohibit_not_strneq:
@prohibit='! *STRNEQ *\(.*\)' \
halt='Use STREQ instead of !STRNEQ' \
$(_sc_search_regexp) $(_sc_search_regexp)
sc_prohibit_verbose_strcat: sc_prohibit_verbose_strcat:
@@ -1246,12 +1241,6 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \
exclude_file_name_regexp--sc_prohibit_pthread_create = \ exclude_file_name_regexp--sc_prohibit_pthread_create = \
^(cfg\.mk|src/util/virthread\.c|tests/.*)$$ ^(cfg\.mk|src/util/virthread\.c|tests/.*)$$
exclude_file_name_regexp--sc_prohibit_not_streq = \
^tests/.*\.[ch]$$
exclude_file_name_regexp--sc_prohibit_not_strneq = \
^tests/.*\.[ch]$$
exclude_file_name_regexp--sc_prohibit_dt_without_code = \ exclude_file_name_regexp--sc_prohibit_dt_without_code = \
^docs/(newapi\.xsl|(apps|contact)\.html\.in)$$ ^docs/(newapi\.xsl|(apps|contact)\.html\.in)$$

2
tests/virstoragetest.c
View File

@@ -698,7 +698,7 @@ testBackingParse(const void *args)
goto cleanup; goto cleanup;
} }
if (!STREQ(xml, data->expect)) { if (STRNEQ(xml, data->expect)) {
fprintf(stderr, "\n backing store string '%s'\n" fprintf(stderr, "\n backing store string '%s'\n"
"expected storage source xml:\n%s\n" "expected storage source xml:\n%s\n"
"actual storage source xml:\n%s\n", "actual storage source xml:\n%s\n",