From: Bruno Haible <bruno@clisp.org>
Date: Sun, 1 Mar 2026 09:50:12 +0000 (+0100)
Subject: tests: Use streq, part 4.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f88d159d4a5b01aaa7a3d8dcdfd3613bfab202c;p=thirdparty%2Fgnulib.git

tests: Use streq, part 4.

* tests/**/*.[hc]: Use streq instead of STREQ.
* tests/macros.h (STREQ): Remove macro.
* modules/*-tests (Dependencies): Add streq.
---

diff --git a/ChangeLog b/ChangeLog
index c6f98e496a..966dc91af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2026-03-01  Bruno Haible  <bruno@clisp.org>
 
+	tests: Use streq, part 4.
+	* tests/**/*.[hc]: Use streq instead of STREQ.
+	* tests/macros.h (STREQ): Remove macro.
+	* modules/*-tests (Dependencies): Add streq.
+
 	tests: Use streq, part 3.
 	* tests/**/*.[hc]: Use streq instead of strcmp.
 	* modules/*-tests (Dependencies): Add streq.
diff --git a/modules/argv-iter-tests b/modules/argv-iter-tests
index fedbf83031..9e0dfafc94 100644
--- a/modules/argv-iter-tests
+++ b/modules/argv-iter-tests
@@ -4,6 +4,7 @@ tests/macros.h
 
 Depends-on:
 tmpfile
+streq
 
 configure.ac:
 
diff --git a/modules/fenv-exceptions-tracking-c99-tests b/modules/fenv-exceptions-tracking-c99-tests
index 8c1dde15c6..2f636ece8e 100644
--- a/modules/fenv-exceptions-tracking-c99-tests
+++ b/modules/fenv-exceptions-tracking-c99-tests
@@ -9,6 +9,7 @@ m4/musl.m4
 
 Depends-on:
 fpe-trapping
+streq
 
 configure.ac:
 gl_MUSL_LIBC
diff --git a/modules/filemode-tests b/modules/filemode-tests
index da025e981e..e96cb322b8 100644
--- a/modules/filemode-tests
+++ b/modules/filemode-tests
@@ -4,6 +4,7 @@ tests/macros.h
 
 Depends-on:
 unistd-h
+streq
 
 configure.ac:
 
diff --git a/modules/getusershell-tests b/modules/getusershell-tests
index 23c4501c1c..3f974a8a55 100644
--- a/modules/getusershell-tests
+++ b/modules/getusershell-tests
@@ -5,6 +5,7 @@ tests/macros.h
 
 Depends-on:
 strdup
+streq
 
 configure.ac:
 
diff --git a/modules/hash-tests b/modules/hash-tests
index b9f99d9900..44d6382b5e 100644
--- a/modules/hash-tests
+++ b/modules/hash-tests
@@ -6,6 +6,7 @@ Depends-on:
 hashcode-string2
 inttostr
 bool
+streq
 
 configure.ac:
 
diff --git a/modules/inttostr-tests b/modules/inttostr-tests
index f4dc08b1bb..80c26036c5 100644
--- a/modules/inttostr-tests
+++ b/modules/inttostr-tests
@@ -6,6 +6,7 @@ Depends-on:
 intprops
 inttypes-h
 snprintf
+streq
 
 configure.ac:
 
diff --git a/modules/perror-tests b/modules/perror-tests
index 016c89df3b..87b38fa104 100644
--- a/modules/perror-tests
+++ b/modules/perror-tests
@@ -10,6 +10,7 @@ dup2
 ftruncate
 strerror
 test-framework-sh
+streq
 
 configure.ac:
 
diff --git a/modules/putenv-gnu-tests b/modules/putenv-gnu-tests
index 43abb8e6c4..46c035fe12 100644
--- a/modules/putenv-gnu-tests
+++ b/modules/putenv-gnu-tests
@@ -5,6 +5,7 @@ tests/signature.h
 
 Depends-on:
 unsetenv
+streq
 
 configure.ac:
 
diff --git a/modules/readtokens-tests b/modules/readtokens-tests
index 5dc8973b9f..7851c75c89 100644
--- a/modules/readtokens-tests
+++ b/modules/readtokens-tests
@@ -6,6 +6,7 @@ tests/test-readtokens.sh
 Depends-on:
 closeout
 test-framework-sh
+streq
 
 configure.ac:
 
diff --git a/modules/sig2str-tests b/modules/sig2str-tests
index 73d59eb6f7..e6d22e7e51 100644
--- a/modules/sig2str-tests
+++ b/modules/sig2str-tests
@@ -4,6 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+streq
 
 configure.ac:
 
diff --git a/modules/stack-tests b/modules/stack-tests
index 10b3f55868..8e22b4ed40 100644
--- a/modules/stack-tests
+++ b/modules/stack-tests
@@ -4,6 +4,7 @@ tests/macros.h
 
 Depends-on:
 string-h
+streq
 
 configure.ac:
 
diff --git a/modules/userspec-tests b/modules/userspec-tests
index a522857740..8b75be202d 100644
--- a/modules/userspec-tests
+++ b/modules/userspec-tests
@@ -3,6 +3,7 @@ tests/test-userspec.c
 
 Depends-on:
 xalloc
+streq
 
 configure.ac:
 
diff --git a/tests/macros.h b/tests/macros.h
index 9982239e5a..3ebf5a791e 100644
--- a/tests/macros.h
+++ b/tests/macros.h
@@ -137,10 +137,6 @@ int volatile test_exit_status = EXIT_SUCCESS;
    parameters of pointer type.  */
 #define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
 
-/* STREQ (str1, str2)
-   Return true if two strings compare equal.  */
-#define STREQ(a, b) (strcmp (a, b) == 0)
-
 /* Some numbers in the interval [0,1).  */
 extern const float randomf[1000];
 extern const double randomd[1000];
diff --git a/tests/test-argv-iter.c b/tests/test-argv-iter.c
index b2c79c83c5..db67b0ef81 100644
--- a/tests/test-argv-iter.c
+++ b/tests/test-argv-iter.c
@@ -26,7 +26,6 @@
 #include "macros.h"
 
 #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-#define STREQ(a, b) (strcmp (a, b) == 0)
 
 static FILE *
 write_nul_delimited_argv (char **argv)
@@ -89,7 +88,7 @@ main (void)
               /* In stream mode, the strings are equal, but
                  in argv mode the actual pointers are equal.  */
               ASSERT (use_stream
-                      ? STREQ (s, av[i][n_found])
+                      ? streq (s, av[i][n_found])
                       : s == av[i][n_found]);
               ++n_found;
             }
diff --git a/tests/test-fenv-except-tracking-3.c b/tests/test-fenv-except-tracking-3.c
index 66e62b0f85..a2178442b6 100644
--- a/tests/test-fenv-except-tracking-3.c
+++ b/tests/test-fenv-except-tracking-3.c
@@ -41,11 +41,11 @@ main (int argc, char *argv[])
     {
       int exception;
 
-      if (STREQ (argv[1], "FE_INVALID"))   exception = FE_INVALID;   else
-      if (STREQ (argv[1], "FE_DIVBYZERO")) exception = FE_DIVBYZERO; else
-      if (STREQ (argv[1], "FE_OVERFLOW"))  exception = FE_OVERFLOW;  else
-      if (STREQ (argv[1], "FE_UNDERFLOW")) exception = FE_UNDERFLOW; else
-      if (STREQ (argv[1], "FE_INEXACT"))   exception = FE_INEXACT;   else
+      if (streq (argv[1], "FE_INVALID"))   exception = FE_INVALID;   else
+      if (streq (argv[1], "FE_DIVBYZERO")) exception = FE_DIVBYZERO; else
+      if (streq (argv[1], "FE_OVERFLOW"))  exception = FE_OVERFLOW;  else
+      if (streq (argv[1], "FE_UNDERFLOW")) exception = FE_UNDERFLOW; else
+      if (streq (argv[1], "FE_INEXACT"))   exception = FE_INEXACT;   else
         {
           printf ("Invalid argument: %s\n", argv[1]);
           exit (1);
diff --git a/tests/test-filemode.c b/tests/test-filemode.c
index 23e400cde1..52296fd2b3 100644
--- a/tests/test-filemode.c
+++ b/tests/test-filemode.c
@@ -70,7 +70,7 @@ main (void)
   for (size_t i = 0; i < SIZEOF (table); ++i)
     {
       strmode (table[i].mode, buffer);
-      ASSERT (STREQ (table[i].str, buffer));
+      ASSERT (streq (table[i].str, buffer));
     }
 
   return test_exit_status;
diff --git a/tests/test-getusershell.c b/tests/test-getusershell.c
index 6b4e8eb96b..dec84f278a 100644
--- a/tests/test-getusershell.c
+++ b/tests/test-getusershell.c
@@ -81,7 +81,7 @@ second_pass (void)
     {
       ptr = getusershell ();
       ASSERT (ptr != NULL);
-      ASSERT (STREQ (ptr, shells[i]));
+      ASSERT (streq (ptr, shells[i]));
       printf ("%s\n", ptr);
       free (shells[i]);
     }
diff --git a/tests/test-hash.c b/tests/test-hash.c
index ae1f415b8c..0bb9ca54ef 100644
--- a/tests/test-hash.c
+++ b/tests/test-hash.c
@@ -28,14 +28,13 @@
 
 #include "macros.h"
 
-#define STREQ(a, b) (strcmp (a, b) == 0)
 #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 
 static bool
 hash_compare_strings (void const *x, void const *y)
 {
   ASSERT (x != y);
-  return STREQ (x, y) ? true : false;
+  return streq (x, y) ? true : false;
 }
 
 static void
@@ -115,7 +114,7 @@ main (int argc, char **argv)
         ASSERT (str1);
         str2 = hash_insert (ht, str1);
         ASSERT (str1 != str2);
-        ASSERT (STREQ (str1, str2));
+        ASSERT (streq (str1, str2));
         free (str1);
       }
       insert_new (ht, "b");
@@ -127,7 +126,7 @@ main (int argc, char **argv)
         void *buf[5] = { NULL };
         ASSERT (hash_get_entries (ht, NULL, 0) == 0);
         ASSERT (hash_get_entries (ht, buf, 5) == 3);
-        ASSERT (STREQ (buf[0], "a") || STREQ (buf[0], "b") || STREQ (buf[0], "c"));
+        ASSERT (streq (buf[0], "a") || streq (buf[0], "b") || streq (buf[0], "c"));
       }
       ASSERT (hash_remove (ht, "a"));
       ASSERT (hash_remove (ht, "a") == NULL);
diff --git a/tests/test-inttostr.c b/tests/test-inttostr.c
index 6841827455..1edb420735 100644
--- a/tests/test-inttostr.c
+++ b/tests/test-inttostr.c
@@ -27,7 +27,6 @@
 
 #include "macros.h"
 
-#define STREQ(a, b) (strcmp (a, b) == 0)
 #define IS_TIGHT(T) (_GL_SIGNED_TYPE_OR_EXPR (T) == TYPE_SIGNED (T))
 #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
 
@@ -50,7 +49,7 @@
           ? snprintf (ref, sizeof ref, "%jd", (intmax_t) TYPE_MINIMUM (T)) \
           : snprintf (ref, sizeof ref, "%ju", (uintmax_t) TYPE_MINIMUM (T))) \
          < sizeof ref);                                                 \
-      ASSERT (STREQ ((p = Fn (TYPE_MINIMUM (T), buf)), ref));           \
+      ASSERT (streq ((p = Fn (TYPE_MINIMUM (T), buf)), ref));           \
       /* Ensure that INT_BUFSIZE_BOUND is tight for signed types.  */   \
       ASSERT (! TYPE_SIGNED (T) || (p == buf && *p == '-'));            \
       ASSERT                                                            \
@@ -58,7 +57,7 @@
           ? snprintf (ref, sizeof ref, "%jd", (intmax_t) TYPE_MAXIMUM (T)) \
           : snprintf (ref, sizeof ref, "%ju", (uintmax_t) TYPE_MAXIMUM (T))) \
          < sizeof ref);                                                 \
-      ASSERT (STREQ ((p = Fn (TYPE_MAXIMUM (T), buf)), ref));           \
+      ASSERT (streq ((p = Fn (TYPE_MAXIMUM (T), buf)), ref));           \
       /* For unsigned types, the bound is not always tight.  */         \
       ASSERT (! IS_TIGHT (T) || TYPE_SIGNED (T)                         \
               || (p == buf && ISDIGIT (*p)));                           \
diff --git a/tests/test-localeconv.c b/tests/test-localeconv.c
index 238ef35e4c..c5a0d12f6c 100644
--- a/tests/test-localeconv.c
+++ b/tests/test-localeconv.c
@@ -35,21 +35,21 @@ main ()
   {
     struct lconv *l = localeconv ();
 
-    ASSERT (STREQ (l->decimal_point, "."));
-    ASSERT (STREQ (l->thousands_sep, ""));
+    ASSERT (streq (l->decimal_point, "."));
+    ASSERT (streq (l->thousands_sep, ""));
 #if !((defined __FreeBSD__ || defined __DragonFly__) || defined __sun || defined __CYGWIN__)
-    ASSERT (STREQ (l->grouping, ""));
+    ASSERT (streq (l->grouping, ""));
 #endif
 
-    ASSERT (STREQ (l->mon_decimal_point, ""));
-    ASSERT (STREQ (l->mon_thousands_sep, ""));
+    ASSERT (streq (l->mon_decimal_point, ""));
+    ASSERT (streq (l->mon_thousands_sep, ""));
 #if !((defined __FreeBSD__ || defined __DragonFly__) || defined __sun || defined __CYGWIN__)
-    ASSERT (STREQ (l->mon_grouping, ""));
+    ASSERT (streq (l->mon_grouping, ""));
 #endif
-    ASSERT (STREQ (l->positive_sign, ""));
-    ASSERT (STREQ (l->negative_sign, ""));
+    ASSERT (streq (l->positive_sign, ""));
+    ASSERT (streq (l->negative_sign, ""));
 
-    ASSERT (STREQ (l->currency_symbol, ""));
+    ASSERT (streq (l->currency_symbol, ""));
     ASSERT (l->frac_digits == CHAR_MAX);
     ASSERT (l->p_cs_precedes == CHAR_MAX);
     ASSERT (l->p_sign_posn == CHAR_MAX);
@@ -58,7 +58,7 @@ main ()
     ASSERT (l->n_sign_posn == CHAR_MAX);
     ASSERT (l->n_sep_by_space == CHAR_MAX);
 
-    ASSERT (STREQ (l->int_curr_symbol, ""));
+    ASSERT (streq (l->int_curr_symbol, ""));
     ASSERT (l->int_frac_digits == CHAR_MAX);
     ASSERT (l->int_p_cs_precedes == CHAR_MAX);
     ASSERT (l->int_p_sign_posn == CHAR_MAX);
diff --git a/tests/test-nstrftime-w32utf8.c b/tests/test-nstrftime-w32utf8.c
index 68c39d2bb4..ae8108bf94 100644
--- a/tests/test-nstrftime-w32utf8.c
+++ b/tests/test-nstrftime-w32utf8.c
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
       ASSERT (n > 0);
       printf ("buf = |%s|\n", buf);
       fflush (stdout);
-      ASSERT (STREQ (buf, "f\303\251vrier")); /* "février" */
+      ASSERT (streq (buf, "f\303\251vrier")); /* "février" */
 
       return test_exit_status;
     }
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
       ASSERT (n > 0);
       printf ("buf = |%s|\n", buf);
       fflush (stdout);
-      ASSERT (STREQ (buf, "\346\260\264\346\233\234\346\227\245")); /* "水曜日" */
+      ASSERT (streq (buf, "\346\260\264\346\233\234\346\227\245")); /* "水曜日" */
 
       return test_exit_status;
     }
diff --git a/tests/test-nstrftime.c b/tests/test-nstrftime.c
index c9c61ef1e3..79b82a91f7 100644
--- a/tests/test-nstrftime.c
+++ b/tests/test-nstrftime.c
@@ -47,7 +47,7 @@ main (void)
   if (setlocale (LC_ALL, "") == NULL)
     return 1;
 
-  bool is_C_locale = STREQ (getenv ("LC_ALL"), "C");
+  bool is_C_locale = streq (getenv ("LC_ALL"), "C");
 
   int fail = 0;
   fail |= posixtm_test ();
diff --git a/tests/test-nstrftime.h b/tests/test-nstrftime.h
index c0eab68b1f..8e4695d147 100644
--- a/tests/test-nstrftime.h
+++ b/tests/test-nstrftime.h
@@ -78,7 +78,7 @@ posixtm_test (void)
           fflush (stdout);
         }
 
-      if (! STREQ (buf, T[i].exp))
+      if (! streq (buf, T[i].exp))
         {
           fail = 1;
           printf ("%s: result mismatch: got %s, expected %s\n",
@@ -239,10 +239,10 @@ tzalloc_test (void)
           continue;
         }
 
-      if (! (STREQ (buf, LT[i].exp)
+      if (! (streq (buf, LT[i].exp)
              || (!tz && n == strlen (LT[i].exp)
                  && memcmp (buf, LT[i].exp, n - sizeof "(GMT)" + 1) == 0
-                 && STREQ (buf + n - sizeof "(GMT)" + 1, "(GMT)"))
+                 && streq (buf + n - sizeof "(GMT)" + 1, "(GMT)"))
 #if defined _WIN32 && !defined __CYGWIN__
              /* On native Windows, the time zone is printed differently.  */
              || strncmp (buf, LT[i].exp, 20) == 0
@@ -369,7 +369,7 @@ errno_test (void)
               ptrdiff_t n1 =
                 FUNC_CHECKED (buf1, sizeof buf1, "%s", tmp, NULL, 0);
               buf1[n1] = '\0';
-              if (! STREQ (buf, buf1))
+              if (! streq (buf, buf1))
                 {
                   fail = 1;
                   printf ("%s %%s first returned '%s', then '%s'\n",
@@ -404,7 +404,7 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("Format as ISO 8601: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "2017-10-26 06:40:03.123456789"));
+  ASSERT (streq (buf, "2017-10-26 06:40:03.123456789"));
 
   /* Exercise various POSIX format directives.  */
 
@@ -415,11 +415,11 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "Thu"));
+      ASSERT (streq (buf, "Thu"));
       break;
     case french:
-      ASSERT (STREQ (buf, "jeu.") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
-              || STREQ (buf, "Jeu") /* macOS, older FreeBSD */);
+      ASSERT (streq (buf, "jeu.") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
+              || streq (buf, "Jeu") /* macOS, older FreeBSD */);
       break;
     }
 
@@ -430,11 +430,11 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "Thursday"));
+      ASSERT (streq (buf, "Thursday"));
       break;
     case french:
-      ASSERT (STREQ (buf, "jeudi") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
-              || STREQ (buf, "Jeudi") /* macOS, older FreeBSD */);
+      ASSERT (streq (buf, "jeudi") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
+              || streq (buf, "Jeudi") /* macOS, older FreeBSD */);
       break;
     }
 
@@ -445,11 +445,11 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "Oct"));
+      ASSERT (streq (buf, "Oct"));
       break;
     case french:
-      ASSERT (STREQ (buf, "oct.") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
-              || STREQ (buf, "oct") /* macOS, older FreeBSD */);
+      ASSERT (streq (buf, "oct.") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
+              || streq (buf, "oct") /* macOS, older FreeBSD */);
       break;
     }
 
@@ -460,10 +460,10 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "October"));
+      ASSERT (streq (buf, "October"));
       break;
     case french:
-      ASSERT (STREQ (buf, "octobre"));
+      ASSERT (streq (buf, "octobre"));
       break;
     }
 
@@ -474,15 +474,15 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "Thu Oct 26 06:40:03 2017"));
+      ASSERT (streq (buf, "Thu Oct 26 06:40:03 2017"));
       break;
     case french:
-      ASSERT (STREQ (buf, "jeu. 26 oct. 2017 06:40:03") /* glibc, Cygwin */
-              || STREQ (buf, "jeu. 26 oct. 06:40:03 2017") /* FreeBSD */
-              || STREQ (buf, "Jeu 26 oct 06:40:03 2017") /* macOS, older FreeBSD */
-              || STREQ (buf, "26 octobre 2017 06:40:03") /* NetBSD */
-              || STREQ (buf, "26 octobre 2017 à 06:40:03") /* Solaris (UTF-8) */
-              || STREQ (buf, "26 octobre 2017 \340 06:40:03") /* Solaris (ISO-8859-1) */);
+      ASSERT (streq (buf, "jeu. 26 oct. 2017 06:40:03") /* glibc, Cygwin */
+              || streq (buf, "jeu. 26 oct. 06:40:03 2017") /* FreeBSD */
+              || streq (buf, "Jeu 26 oct 06:40:03 2017") /* macOS, older FreeBSD */
+              || streq (buf, "26 octobre 2017 06:40:03") /* NetBSD */
+              || streq (buf, "26 octobre 2017 à 06:40:03") /* Solaris (UTF-8) */
+              || streq (buf, "26 octobre 2017 \340 06:40:03") /* Solaris (ISO-8859-1) */);
       break;
     }
 
@@ -490,43 +490,43 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%C directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "20"));
+  ASSERT (streq (buf, "20"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%d", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%d directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "26"));
+  ASSERT (streq (buf, "26"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%D", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%D directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "10/26/17"));
+  ASSERT (streq (buf, "10/26/17"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%e", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%e directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "26"));
+  ASSERT (streq (buf, "26"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%F", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%F directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "2017-10-26"));
+  ASSERT (streq (buf, "2017-10-26"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%g", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%g directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "17"));
+  ASSERT (streq (buf, "17"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%G", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%G directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "2017"));
+  ASSERT (streq (buf, "2017"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%h", tm, NULL, ns);
   ASSERT (n > 0);
@@ -535,11 +535,11 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "Oct"));
+      ASSERT (streq (buf, "Oct"));
       break;
     case french:
-      ASSERT (STREQ (buf, "oct.") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
-              || STREQ (buf, "oct") /* macOS, older FreeBSD */);
+      ASSERT (streq (buf, "oct.") /* glibc, FreeBSD, NetBSD, Solaris, Cygwin */
+              || streq (buf, "oct") /* macOS, older FreeBSD */);
       break;
     }
 
@@ -547,37 +547,37 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%H directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "06"));
+  ASSERT (streq (buf, "06"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%I", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%I directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "06"));
+  ASSERT (streq (buf, "06"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%j", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%j directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "299"));
+  ASSERT (streq (buf, "299"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%m", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%m directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "10"));
+  ASSERT (streq (buf, "10"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%M", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%M directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "40"));
+  ASSERT (streq (buf, "40"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%n", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%n directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "\n"));
+  ASSERT (streq (buf, "\n"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%p", tm, NULL, ns);
   switch (language)
@@ -586,7 +586,7 @@ locales_test (language_t language)
       ASSERT (n > 0);
       printf ("%%p directive: %s\n", buf);
       fflush (stdout);
-      ASSERT (STREQ (buf, "AM"));
+      ASSERT (streq (buf, "AM"));
       break;
     case french:
       ASSERT (n == 0);
@@ -600,12 +600,12 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "06:40:03 AM"));
+      ASSERT (streq (buf, "06:40:03 AM"));
       break;
     case french:
-      ASSERT (STREQ (buf, "06:40:03 ") /* glibc */
-              || STREQ (buf, "06:40:03") /* NetBSD, Cygwin */
-              || STREQ (buf, " 6:40:03") /* Solaris */);
+      ASSERT (streq (buf, "06:40:03 ") /* glibc */
+              || streq (buf, "06:40:03") /* NetBSD, Cygwin */
+              || streq (buf, " 6:40:03") /* Solaris */);
       break;
     }
 
@@ -613,55 +613,55 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%R directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "06:40"));
+  ASSERT (streq (buf, "06:40"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%S", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%S directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "03"));
+  ASSERT (streq (buf, "03"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%t", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%t directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "\t"));
+  ASSERT (streq (buf, "\t"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%T", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%T directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "06:40:03"));
+  ASSERT (streq (buf, "06:40:03"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%u", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%u directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "4"));
+  ASSERT (streq (buf, "4"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%U", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%U directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "43"));
+  ASSERT (streq (buf, "43"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%V", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%V directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "43"));
+  ASSERT (streq (buf, "43"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%w", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%w directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "4"));
+  ASSERT (streq (buf, "4"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%W", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%W directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "43"));
+  ASSERT (streq (buf, "43"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%x", tm, NULL, ns);
   ASSERT (n > 0);
@@ -670,11 +670,11 @@ locales_test (language_t language)
   switch (language)
     {
     case english:
-      ASSERT (STREQ (buf, "10/26/17"));
+      ASSERT (streq (buf, "10/26/17"));
       break;
     case french:
-      ASSERT (STREQ (buf, "26/10/2017") /* glibc, NetBSD, Solaris, Cygwin */
-              || STREQ (buf, "26.10.2017") /* FreeBSD, macOS */);
+      ASSERT (streq (buf, "26/10/2017") /* glibc, NetBSD, Solaris, Cygwin */
+              || streq (buf, "26.10.2017") /* FreeBSD, macOS */);
       break;
     }
 
@@ -682,38 +682,38 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%X directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "06:40:03"));
+  ASSERT (streq (buf, "06:40:03"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%y", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%y directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "17"));
+  ASSERT (streq (buf, "17"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%Y", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%Y directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "2017"));
+  ASSERT (streq (buf, "2017"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%z", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%z directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "+0000"));
+  ASSERT (streq (buf, "+0000"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%Z", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%Z directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "GMT") /* glibc, NetBSD, OpenBSD, AIX, Solaris, Cygwin, Android */
-          || STREQ (buf, "UTC") /* musl, macOS, FreeBSD */);
+  ASSERT (streq (buf, "GMT") /* glibc, NetBSD, OpenBSD, AIX, Solaris, Cygwin, Android */
+          || streq (buf, "UTC") /* musl, macOS, FreeBSD */);
 
   n = FUNC_CHECKED (buf, sizeof buf, "%%", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%%% directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "%"));
+  ASSERT (streq (buf, "%"));
 
   /* Exercise various GNU extensions from glibc.  */
 
@@ -721,13 +721,13 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%k directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, " 6"));
+  ASSERT (streq (buf, " 6"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%l", tm, NULL, ns);
   ASSERT (n > 0);
   printf ("%%l directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, " 6"));
+  ASSERT (streq (buf, " 6"));
 
   n = FUNC_CHECKED (buf, sizeof buf, "%P", tm, NULL, ns);
   switch (language)
@@ -736,7 +736,7 @@ locales_test (language_t language)
       ASSERT (n > 0);
       printf ("%%P directive: %s\n", buf);
       fflush (stdout);
-      ASSERT (STREQ (buf, "am"));
+      ASSERT (streq (buf, "am"));
       break;
     case french:
       ASSERT (n == 0);
@@ -747,7 +747,7 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%s directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "1509000003"));
+  ASSERT (streq (buf, "1509000003"));
 
   /* Exercise various GNU extensions from gnulib.  */
 
@@ -755,7 +755,7 @@ locales_test (language_t language)
   ASSERT (n > 0);
   printf ("%%N directive: %s\n", buf);
   fflush (stdout);
-  ASSERT (STREQ (buf, "123456789"));
+  ASSERT (streq (buf, "123456789"));
 
   return fail;
 }
diff --git a/tests/test-perror2.c b/tests/test-perror2.c
index 92dd735768..a89d97cbad 100644
--- a/tests/test-perror2.c
+++ b/tests/test-perror2.c
@@ -84,7 +84,7 @@ main (void)
     errno = -5;
     perror ("");
     ASSERT (!ferror (stderr));
-    ASSERT (STREQ (msg4, str4));
+    ASSERT (streq (msg4, str4));
 
     free (str1);
     free (str2);
diff --git a/tests/test-putenv.c b/tests/test-putenv.c
index 9ea08b0ab9..c80598cefe 100644
--- a/tests/test-putenv.c
+++ b/tests/test-putenv.c
@@ -46,7 +46,7 @@ main (void)
     ASSERT (putenv (var) == 0);
     ptr = getenv ("TEST_VAR");
     ASSERT (ptr != NULL);
-    ASSERT (STREQ (ptr, "abc"));
+    ASSERT (streq (ptr, "abc"));
   }
 
   /* Verify removing an environment variable.  */
diff --git a/tests/test-readtokens.c b/tests/test-readtokens.c
index 6f945f5347..8b7d4f6ff1 100644
--- a/tests/test-readtokens.c
+++ b/tests/test-readtokens.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   delim = argv[1];
   delim_len = strlen (delim);
 
-  if (STREQ (delim, "\\0"))
+  if (streq (delim, "\\0"))
     {
       delim = "";
       delim_len = 1;
diff --git a/tests/test-sig2str.c b/tests/test-sig2str.c
index 815919074f..87f08c954c 100644
--- a/tests/test-sig2str.c
+++ b/tests/test-sig2str.c
@@ -37,22 +37,22 @@ test_sig2str (void)
   /* Test sig2str on signals specified by ISO C.  */
 
   ASSERT (sig2str (SIGABRT, buffer) == 0);
-  ASSERT (STREQ (buffer, "ABRT"));
+  ASSERT (streq (buffer, "ABRT"));
 
   ASSERT (sig2str (SIGFPE, buffer) == 0);
-  ASSERT (STREQ (buffer, "FPE"));
+  ASSERT (streq (buffer, "FPE"));
 
   ASSERT (sig2str (SIGILL, buffer) == 0);
-  ASSERT (STREQ (buffer, "ILL"));
+  ASSERT (streq (buffer, "ILL"));
 
   ASSERT (sig2str (SIGINT, buffer) == 0);
-  ASSERT (STREQ (buffer, "INT"));
+  ASSERT (streq (buffer, "INT"));
 
   ASSERT (sig2str (SIGSEGV, buffer) == 0);
-  ASSERT (STREQ (buffer, "SEGV"));
+  ASSERT (streq (buffer, "SEGV"));
 
   ASSERT (sig2str (SIGTERM, buffer) == 0);
-  ASSERT (STREQ (buffer, "TERM"));
+  ASSERT (streq (buffer, "TERM"));
 
   /* Check behavior of sig2str on invalid signals.  */
 
diff --git a/tests/test-stack.c b/tests/test-stack.c
index cdf322b705..de733755ff 100644
--- a/tests/test-stack.c
+++ b/tests/test-stack.c
@@ -65,7 +65,7 @@ main (void)
   string_stack_type string_stack [1];
   string_stack_init (string_stack);
   string_stack_push (string_stack, "foo");
-  ASSERT (STREQ (string_stack_pop (string_stack), "foo"));
+  ASSERT (streq (string_stack_pop (string_stack), "foo"));
   ASSERT (string_stack_empty (string_stack));
   string_stack_destroy (string_stack);
 
diff --git a/tests/test-strerror_r.c b/tests/test-strerror_r.c
index a15296a0cf..87544fd4e6 100644
--- a/tests/test-strerror_r.c
+++ b/tests/test-strerror_r.c
@@ -163,7 +163,7 @@ main (void)
 
     strerror_r (EACCES, buf, sizeof buf);
     strerror_r (-5, buf, sizeof buf);
-    ASSERT (STREQ (msg4, str4));
+    ASSERT (streq (msg4, str4));
 
     free (str1);
     free (str2);
diff --git a/tests/test-userspec.c b/tests/test-userspec.c
index bf8ab06391..61723e1261 100644
--- a/tests/test-userspec.c
+++ b/tests/test-userspec.c
@@ -76,8 +76,6 @@ static struct test T[] =
     { "" /* placeholder */,    -1, -1,     "",     "", NULL},
   };
 
-#define STREQ(a, b) (strcmp (a, b) == 0)
-
 static char const *
 maybe_null (char const *s)
 {
@@ -91,7 +89,7 @@ same_diag (char const *s, char const *t)
     return true;
   if (s == NULL || t == NULL)
     return false;
-  return STREQ (s, t);
+  return streq (s, t);
 }
 
 int
@@ -187,9 +185,9 @@ main (void)
                 printf ("%s did not warn\n", T[i].in);
               else if (! (uid == uid2 && gid == gid2
                           && !!user_name == !!user_name2
-                          && (!user_name || STREQ (user_name, user_name2))
+                          && (!user_name || streq (user_name, user_name2))
                           && !!group_name == !!group_name2
-                          && (!group_name || STREQ (group_name, group_name2))))
+                          && (!group_name || streq (group_name, group_name2))))
                 printf ("%s treated differently than with colon\n", T[i].in);
 
               free (user_name2);