From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 16 Jun 2016 12:16:43 +0000 (+0200)
Subject: cfg.mk: join not_streq and not_strneq tests
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f9785569de082b747856d299fd99934ca1798cf5;p=libvirt.git

cfg.mk: join not_streq and not_strneq tests

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.
---

diff --git a/cfg.mk b/cfg.mk
index 9f236c2c8b..9f5949cb25 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -986,13 +986,8 @@ sc_prohibit_pthread_create:
 	  $(_sc_search_regexp)
 
 sc_prohibit_not_streq:
-	@prohibit='! *STREQ *\(.*\)'		\
-	halt='Use STRNEQ instead of !STREQ'	\
-	  $(_sc_search_regexp)
-
-sc_prohibit_not_strneq:
-	@prohibit='! *STRNEQ *\(.*\)'       \
-	halt='Use STREQ instead of !STRNEQ'	\
+	@prohibit='! *STRN?EQ *\(.*\)'		\
+	halt='Use STRNEQ instead of !STREQ and STREQ instead of !STRNEQ'	\
 	  $(_sc_search_regexp)
 
 sc_prohibit_verbose_strcat:
@@ -1246,12 +1241,6 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \
 exclude_file_name_regexp--sc_prohibit_pthread_create = \
   ^(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 = \
   ^docs/(newapi\.xsl|(apps|contact)\.html\.in)$$
 
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index b3d59adc3f..f7f5030daa 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -698,7 +698,7 @@ testBackingParse(const void *args)
         goto cleanup;
     }
 
-    if (!STREQ(xml, data->expect)) {
+    if (STRNEQ(xml, data->expect)) {
         fprintf(stderr, "\n backing store string '%s'\n"
                         "expected storage source xml:\n%s\n"
                         "actual storage source xml:\n%s\n",