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 9f236c2c8b759c0a1597c959e49def2fede7d779..9f5949cb250a340e483a890c6e04be8b3dcc9856 100644 (file)
--- 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 b3d59adc3fc97d7178e5a2380b946be4381ed066..f7f5030daa4ea5b55311804d5a49980382437d22 100644 (file)
--- 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",