From e016983c7406fb8aa0c750053425ffb3cbaeec4a Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 28 Mar 2010 01:29:52 +0100
Subject: [PATCH] Resolve conflict between the two kinds of module indicators.

---
 ChangeLog                              | 52 +++++++++++++++++++++++
 m4/gnulib-common.m4                    |  6 +--
 modules/canonicalize                   |  1 +
 tests/test-canonicalize-lgpl.c         |  2 +-
 tests/test-dirent-c++.cc               |  6 +--
 tests/test-dirent-safer.c              |  8 ++--
 tests/test-dup2.c                      |  8 ++--
 tests/test-fchdir.c                    |  2 +-
 tests/test-fcntl-h-c++.cc              |  6 +--
 tests/test-getopt.c                    |  8 ++--
 tests/test-getopt.h                    |  4 +-
 tests/test-langinfo-c++.cc             |  2 +-
 tests/test-locale-c++.cc               |  2 +-
 tests/test-math-c++.cc                 | 44 ++++++++++----------
 tests/test-pty-c++.cc                  |  4 +-
 tests/test-search-c++.cc               |  2 +-
 tests/test-signal-c++.cc               |  4 +-
 tests/test-spawn-c++.cc                | 42 +++++++++----------
 tests/test-stdio-c++.cc                | 68 +++++++++++++++---------------
 tests/test-stdlib-c++.cc               | 54 ++++++++++++------------
 tests/test-string-c++.cc               | 46 ++++++++++----------
 tests/test-sys_ioctl-c++.cc            |  2 +-
 tests/test-sys_select-c++.cc           |  2 +-
 tests/test-sys_socket-c++.cc           | 30 +++++++-------
 tests/test-sys_stat-c++.cc             | 24 +++++------
 tests/test-sys_time-c++.cc             |  2 +-
 tests/test-time-c++.cc                 | 10 ++---
 tests/test-unistd-c++.cc               | 76 +++++++++++++++++-----------------
 tests/test-wchar-c++.cc                | 22 +++++-----
 tests/uninorm/test-u16-nfc.c           |  2 +-
 tests/uninorm/test-u16-nfd.c           |  2 +-
 tests/uninorm/test-u16-nfkc.c          |  2 +-
 tests/uninorm/test-u16-nfkd.c          |  2 +-
 tests/uninorm/test-u32-nfc-big.c       |  2 +-
 tests/uninorm/test-u32-nfc.c           |  2 +-
 tests/uninorm/test-u32-nfd-big.c       |  2 +-
 tests/uninorm/test-u32-nfd.c           |  2 +-
 tests/uninorm/test-u32-nfkc-big.c      |  2 +-
 tests/uninorm/test-u32-nfkc.c          |  2 +-
 tests/uninorm/test-u32-nfkd-big.c      |  2 +-
 tests/uninorm/test-u32-nfkd.c          |  2 +-
 tests/uninorm/test-u32-normalize-big.c |  2 +-
 tests/uninorm/test-u8-nfc.c            |  2 +-
 tests/uninorm/test-u8-nfd.c            |  2 +-
 tests/uninorm/test-u8-nfkc.c           |  2 +-
 tests/uninorm/test-u8-nfkd.c           |  2 +-
 46 files changed, 313 insertions(+), 260 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b2977605..a85ba5928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,57 @@
 2010-03-27  Bruno Haible  <bruno@clisp.org>
 
+	Resolve conflict between the two kinds of module indicators.
+	* m4/gnulib-common.m4 (gl_MODULE_INDICATOR_FOR_TESTS): Define
+	GNULIB_TEST_XYZ instead of GNULIB_XYZ.
+	* modules/canonicalize (configure.ac): Invoke
+	gl_MODULE_INDICATOR_FOR_TESTS.
+	* tests/test-canonicalize-lgpl.c: Test GNULIB_TEST_XYZ instead of
+	GNULIB_XYZ.
+	* tests/test-dirent-c++.cc: Likewise.
+	* tests/test-dirent-safer.c: Likewise.
+	* tests/test-dup2.c: Likewise.
+	* tests/test-fchdir.c: Likewise.
+	* tests/test-fcntl-h-c++.cc: Likewise.
+	* tests/test-getopt.c: Likewise.
+	* tests/test-getopt.h: Likewise.
+	* tests/test-langinfo-c++.cc: Likewise.
+	* tests/test-locale-c++.cc: Likewise.
+	* tests/test-math-c++.cc: Likewise.
+	* tests/test-pty-c++.cc: Likewise.
+	* tests/test-search-c++.cc: Likewise.
+	* tests/test-signal-c++.cc: Likewise.
+	* tests/test-spawn-c++.cc: Likewise.
+	* tests/test-stdio-c++.cc: Likewise.
+	* tests/test-stdlib-c++.cc: Likewise.
+	* tests/test-string-c++.cc: Likewise.
+	* tests/test-sys_ioctl-c++.cc: Likewise.
+	* tests/test-sys_select-c++.cc: Likewise.
+	* tests/test-sys_socket-c++.cc: Likewise.
+	* tests/test-sys_stat-c++.cc: Likewise.
+	* tests/test-sys_time-c++.cc: Likewise.
+	* tests/test-time-c++.cc: Likewise.
+	* tests/test-unistd-c++.cc: Likewise.
+	* tests/test-wchar-c++.cc: Likewise.
+	* tests/uninorm/test-u8-nfc.c: Likewise.
+	* tests/uninorm/test-u8-nfd.c: Likewise.
+	* tests/uninorm/test-u8-nfkc.c: Likewise.
+	* tests/uninorm/test-u8-nfkd.c: Likewise.
+	* tests/uninorm/test-u16-nfc.c: Likewise.
+	* tests/uninorm/test-u16-nfd.c: Likewise.
+	* tests/uninorm/test-u16-nfkc.c: Likewise.
+	* tests/uninorm/test-u16-nfkd.c: Likewise.
+	* tests/uninorm/test-u32-nfc.c: Likewise.
+	* tests/uninorm/test-u32-nfc-big.c: Likewise.
+	* tests/uninorm/test-u32-nfd.c: Likewise.
+	* tests/uninorm/test-u32-nfd-big.c: Likewise.
+	* tests/uninorm/test-u32-nfkc.c: Likewise.
+	* tests/uninorm/test-u32-nfkc-big.c: Likewise.
+	* tests/uninorm/test-u32-nfkd.c: Likewise.
+	* tests/uninorm/test-u32-nfkd-big.c: Likewise.
+	* tests/uninorm/test-u32-normalize-big.c: Likewise.
+
+2010-03-27  Bruno Haible  <bruno@clisp.org>
+
 	Distinguish two kinds of module indicators.
 	* m4/gnulib-common.m4 (gl_MODULE_INDICATOR_FOR_TESTS): Renamed from
 	gl_MODULE_INDICATOR.
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 09ea950e2..f8e32e39f 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 16
+# gnulib-common.m4 serial 17
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -85,8 +85,8 @@ AC_DEFUN([gl_MODULE_INDICATOR],
 # --------------------------------------------+---------+-----------+
 AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
 [
-  AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
-    [Define to 1 when using the gnulib module ]$1[.])
+  AC_DEFINE([GNULIB_TEST_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
+    [Define to 1 when the gnulib module ]$1[ should be tested.])
 ])
 
 # m4_foreach_w
diff --git a/modules/canonicalize b/modules/canonicalize
index 39a5102e3..4ed943bd8 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -23,6 +23,7 @@ xgetcwd
 configure.ac:
 gl_FUNC_CANONICALIZE_FILENAME_MODE
 gl_MODULE_INDICATOR([canonicalize])
+gl_MODULE_INDICATOR_FOR_TESTS([canonicalize])
 gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
 
 Makefile.am:
diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index cbf481d39..6a5c45d76 100644
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -46,7 +46,7 @@ null_ptr (void)
 int
 main (void)
 {
-#ifdef GNULIB_CANONICALIZE
+#if GNULIB_TEST_CANONICALIZE
   /* No need to test canonicalize-lgpl module if canonicalize is also
      in use.  */
   return 0;
diff --git a/tests/test-dirent-c++.cc b/tests/test-dirent-c++.cc
index 7e0263c99..ed58c7cf4 100644
--- a/tests/test-dirent-c++.cc
+++ b/tests/test-dirent-c++.cc
@@ -26,20 +26,20 @@
 
 SIGNATURE_CHECK (GNULIB_NAMESPACE::closedir, int, (DIR *));
 
-#if GNULIB_FDOPENDIR
+#if GNULIB_TEST_FDOPENDIR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fdopendir, DIR *, (int));
 #endif
 
 SIGNATURE_CHECK (GNULIB_NAMESPACE::opendir, DIR *, (const char *));
 
-#if GNULIB_SCANDIR
+#if GNULIB_TEST_SCANDIR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::scandir, int,
                  (const char *, struct dirent ***,
                   int (*) (const struct dirent *),
                   int (*) (const struct dirent **, const struct dirent **)));
 #endif
 
-#if GNULIB_ALPHASORT
+#if GNULIB_TEST_ALPHASORT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::alphasort, int,
                  (const struct dirent **, const struct dirent **));
 #endif
diff --git a/tests/test-dirent-safer.c b/tests/test-dirent-safer.c
index 1a83eeac7..dc8b6a229 100644
--- a/tests/test-dirent-safer.c
+++ b/tests/test-dirent-safer.c
@@ -48,7 +48,7 @@ main (void)
      gnulib version of fdopendir is unable to guarantee that
      dirfd(fdopendir(fd))==fd, but we can at least guarantee that if
      they are not equal, the fd returned by dirfd is safe.  */
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
   int dfd;
 #endif
 
@@ -57,7 +57,7 @@ main (void)
       || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
     return 2;
 
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
   dfd = open (".", O_RDONLY);
   ASSERT (STDERR_FILENO < dfd);
 #endif
@@ -73,7 +73,7 @@ main (void)
       ASSERT (dirfd (dp) == -1 || STDERR_FILENO < dirfd (dp));
       ASSERT (closedir (dp) == 0);
 
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
       {
         int fd = dup_safer (dfd);
         ASSERT (STDERR_FILENO < fd);
@@ -88,7 +88,7 @@ main (void)
 #endif
     }
 
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
   ASSERT (close (dfd) == 0);
 #endif
 
diff --git a/tests/test-dup2.c b/tests/test-dup2.c
index 3bad63a00..cef9a304d 100644
--- a/tests/test-dup2.c
+++ b/tests/test-dup2.c
@@ -28,7 +28,7 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 
 #include "binary-io.h"
 
-#if GNULIB_CLOEXEC
+#if GNULIB_TEST_CLOEXEC
 # include "cloexec.h"
 #endif
 
@@ -57,7 +57,7 @@ is_open (int fd)
 #endif
 }
 
-#if GNULIB_CLOEXEC
+#if GNULIB_TEST_CLOEXEC
 /* Return non-zero if FD is open and inheritable across exec/spawn.  */
 static int
 is_inheritable (int fd)
@@ -79,7 +79,7 @@ is_inheritable (int fd)
   return 0 <= i && (i & FD_CLOEXEC) == 0;
 # endif
 }
-#endif /* GNULIB_CLOEXEC */
+#endif /* GNULIB_TEST_CLOEXEC */
 
 #if !O_BINARY
 # define setmode(f,m) zero ()
@@ -161,7 +161,7 @@ main (void)
   ASSERT (read (fd, buffer, 1) == 1);
   ASSERT (*buffer == '2');
 
-#if GNULIB_CLOEXEC
+#if GNULIB_TEST_CLOEXEC
   /* Any new fd created by dup2 must not be cloexec.  */
   ASSERT (close (fd + 2) == 0);
   ASSERT (dup_cloexec (fd) == fd + 1);
diff --git a/tests/test-fchdir.c b/tests/test-fchdir.c
index fca3ccd62..145cafb9d 100644
--- a/tests/test-fchdir.c
+++ b/tests/test-fchdir.c
@@ -84,7 +84,7 @@ main (void)
           ASSERT (close (fd) == 0);
           ASSERT (fcntl (new_fd, F_DUPFD, fd) == fd);
           ASSERT (close (new_fd) == 0);
-#if GNULIB_DUP3
+#if GNULIB_TEST_DUP3
           ASSERT (dup3 (fd, new_fd, 0) == new_fd);
           ASSERT (dup3 (new_fd, fd, 0) == fd);
           ASSERT (close (new_fd) == 0);
diff --git a/tests/test-fcntl-h-c++.cc b/tests/test-fcntl-h-c++.cc
index 8b6942599..6e8b246a2 100644
--- a/tests/test-fcntl-h-c++.cc
+++ b/tests/test-fcntl-h-c++.cc
@@ -24,15 +24,15 @@
 #include "signature.h"
 
 
-#if GNULIB_FCNTL
+#if GNULIB_TEST_FCNTL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fcntl, int, (int, int, ...));
 #endif
 
-#if GNULIB_OPEN
+#if GNULIB_TEST_OPEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::open, int, (const char *, int, ...));
 #endif
 
-#if GNULIB_OPENAT
+#if GNULIB_TEST_OPENAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::openat, int, (int, char const *, int, ...));
 #endif
 
diff --git a/tests/test-getopt.c b/tests/test-getopt.c
index 6bcb8e6ae..86fe56640 100644
--- a/tests/test-getopt.c
+++ b/tests/test-getopt.c
@@ -22,7 +22,7 @@
    ftell link warning if we are not using the gnulib ftell module.  */
 #define _GL_NO_LARGE_FILES
 
-#if GNULIB_GETOPT_GNU
+#if GNULIB_TEST_GETOPT_GNU
 # include <getopt.h>
 
 # ifndef __getopt_argv_const
@@ -58,7 +58,7 @@ SIGNATURE_CHECK (getopt, int, (int, char * const[], char const *));
 static FILE *myerr;
 
 #include "test-getopt.h"
-#if GNULIB_GETOPT_GNU
+#if GNULIB_TEST_GETOPT_GNU
 # include "test-getopt_long.h"
 #endif
 
@@ -80,14 +80,14 @@ main (void)
   setenv ("POSIXLY_CORRECT", "1", 1);
   test_getopt ();
 
-#if GNULIB_GETOPT_GNU
+#if GNULIB_TEST_GETOPT_GNU
   test_getopt_long_posix ();
 #endif
 
   unsetenv ("POSIXLY_CORRECT");
   test_getopt ();
 
-#if GNULIB_GETOPT_GNU
+#if GNULIB_TEST_GETOPT_GNU
   test_getopt_long ();
   test_getopt_long_only ();
 #endif
diff --git a/tests/test-getopt.h b/tests/test-getopt.h
index 0db8f1c6f..96db7a5f8 100644
--- a/tests/test-getopt.h
+++ b/tests/test-getopt.h
@@ -323,7 +323,7 @@ test_getopt (void)
       ASSERT (!output);
     }
 
-#if GNULIB_GETOPT_GNU
+#if GNULIB_TEST_GETOPT_GNU
   /* Test processing of options with optional arguments.  */
   for (start = OPTIND_MIN; start <= 1; start++)
     {
@@ -870,7 +870,7 @@ test_getopt (void)
         }
     }
 
-#if GNULIB_GETOPT_GNU
+#if GNULIB_TEST_GETOPT_GNU
   /* Check that the '-' flag causes non-options to be returned in order.  */
   for (start = OPTIND_MIN; start <= 1; start++)
     {
diff --git a/tests/test-langinfo-c++.cc b/tests/test-langinfo-c++.cc
index 6d9c91851..a0424fe2f 100644
--- a/tests/test-langinfo-c++.cc
+++ b/tests/test-langinfo-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_NL_LANGINFO
+#if GNULIB_TEST_NL_LANGINFO
 SIGNATURE_CHECK (GNULIB_NAMESPACE::nl_langinfo, char *, (nl_item));
 #endif
 
diff --git a/tests/test-locale-c++.cc b/tests/test-locale-c++.cc
index e04a235e2..314923c45 100644
--- a/tests/test-locale-c++.cc
+++ b/tests/test-locale-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_DUPLOCALE && HAVE_DUPLOCALE
+#if GNULIB_TEST_DUPLOCALE && HAVE_DUPLOCALE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::duplocale, locale_t, (locale_t));
 #endif
 
diff --git a/tests/test-math-c++.cc b/tests/test-math-c++.cc
index 9772a1638..8be774b81 100644
--- a/tests/test-math-c++.cc
+++ b/tests/test-math-c++.cc
@@ -37,7 +37,7 @@
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::exp, double, (double));
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::fabs, double, (double));
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::fmod, double, (double, double));
-#if GNULIB_FREXP
+#if GNULIB_TEST_FREXP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::frexp, double, (double, int *));
 #endif
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::hypot, double, (double, double));
@@ -64,87 +64,87 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::frexp, double, (double, int *));
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::y1, double, (double));
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::yn, double, (int, double));
 
-#if GNULIB_ACOSL
+#if GNULIB_TEST_ACOSL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::acosl, long double, (long double));
 #endif
 
-#if GNULIB_ASINL
+#if GNULIB_TEST_ASINL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::asinl, long double, (long double));
 #endif
 
-#if GNULIB_ATANL
+#if GNULIB_TEST_ATANL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::atanl, long double, (long double));
 #endif
 
-#if GNULIB_CEILF
+#if GNULIB_TEST_CEILF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ceilf, float, (float));
 #endif
 
-#if GNULIB_CEILL
+#if GNULIB_TEST_CEILL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ceill, long double, (long double));
 #endif
 
-#if GNULIB_COSL
+#if GNULIB_TEST_COSL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::cosl, long double, (long double));
 #endif
 
-#if GNULIB_EXPL
+#if GNULIB_TEST_EXPL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::expl, long double, (long double));
 #endif
 
-#if GNULIB_FLOORF
+#if GNULIB_TEST_FLOORF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::floorf, float, (float));
 #endif
 
-#if GNULIB_FLOORL
+#if GNULIB_TEST_FLOORL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::floorl, long double, (long double));
 #endif
 
-#if GNULIB_FREXPL
+#if GNULIB_TEST_FREXPL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::frexpl, long double, (long double, int *));
 #endif
 
-#if GNULIB_LDEXPL
+#if GNULIB_TEST_LDEXPL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ldexpl, long double, (long double, int));
 #endif
 
-#if GNULIB_LOGL
+#if GNULIB_TEST_LOGL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::logl, long double, (long double));
 #endif
 
-#if GNULIB_ROUNDF
+#if GNULIB_TEST_ROUNDF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::roundf, float, (float));
 #endif
 
-#if GNULIB_ROUND
+#if GNULIB_TEST_ROUND
 SIGNATURE_CHECK (GNULIB_NAMESPACE::round, double, (double));
 #endif
 
-#if GNULIB_ROUNDL
+#if GNULIB_TEST_ROUNDL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::roundl, long double, (long double));
 #endif
 
-#if GNULIB_SINL
+#if GNULIB_TEST_SINL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sinl, long double, (long double));
 #endif
 
-#if GNULIB_SQRTL
+#if GNULIB_TEST_SQRTL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sqrtl, long double, (long double));
 #endif
 
-#if GNULIB_TANL
+#if GNULIB_TEST_TANL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::tanl, long double, (long double));
 #endif
 
-#if GNULIB_TRUNCF
+#if GNULIB_TEST_TRUNCF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::truncf, float, (float));
 #endif
 
-#if GNULIB_TRUNC
+#if GNULIB_TEST_TRUNC
 SIGNATURE_CHECK (GNULIB_NAMESPACE::trunc, double, (double));
 #endif
 
-#if GNULIB_TRUNCL
+#if GNULIB_TEST_TRUNCL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::truncl, long double, (long double));
 #endif
 
diff --git a/tests/test-pty-c++.cc b/tests/test-pty-c++.cc
index 1f1cefe76..26b3a3434 100644
--- a/tests/test-pty-c++.cc
+++ b/tests/test-pty-c++.cc
@@ -24,13 +24,13 @@
 #include "signature.h"
 
 
-#if GNULIB_FORKPTY
+#if GNULIB_TEST_FORKPTY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::forkpty, int,
                  (int *, char *, struct termios const *,
                   struct winsize const *));
 #endif
 
-#if GNULIB_OPENPTY
+#if GNULIB_TEST_OPENPTY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::openpty, int,
                  (int *, int *, char *, struct termios const *,
                   struct winsize const *));
diff --git a/tests/test-search-c++.cc b/tests/test-search-c++.cc
index 0437b8f58..d2d94a23d 100644
--- a/tests/test-search-c++.cc
+++ b/tests/test-search-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_TSEARCH
+#if GNULIB_TEST_TSEARCH
 SIGNATURE_CHECK (GNULIB_NAMESPACE::tsearch, void *,
                  (const void *, void **, _gl_search_compar_fn));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::tfind, void *,
diff --git a/tests/test-signal-c++.cc b/tests/test-signal-c++.cc
index e5457aeee..fa0602110 100644
--- a/tests/test-signal-c++.cc
+++ b/tests/test-signal-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_SIGPROCMASK
+#if GNULIB_TEST_SIGPROCMASK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sigismember, int, (const sigset_t *, int));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sigemptyset, int, (sigset_t *));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sigaddset, int, (sigset_t *, int));
@@ -39,7 +39,7 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::signal,
 SIGNATURE_CHECK (GNULIB_NAMESPACE::raise, int, (int));
 #endif
 
-#if GNULIB_SIGACTION
+#if GNULIB_TEST_SIGACTION
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sigaction, int,
                  (int, const struct sigaction *, struct sigaction *));
 #endif
diff --git a/tests/test-spawn-c++.cc b/tests/test-spawn-c++.cc
index 11d4766f7..f2bc9f672 100644
--- a/tests/test-spawn-c++.cc
+++ b/tests/test-spawn-c++.cc
@@ -24,110 +24,110 @@
 #include "signature.h"
 
 
-#if GNULIB_POSIX_SPAWN
+#if GNULIB_TEST_POSIX_SPAWN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawn, int,
                  (pid_t *, const char *, const posix_spawn_file_actions_t *,
                   const posix_spawnattr_t *, char *const[], char *const[]));
 #endif
 
-#if GNULIB_POSIX_SPAWNP
+#if GNULIB_TEST_POSIX_SPAWNP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnp, int,
                  (pid_t *, const char *, const posix_spawn_file_actions_t *,
                   const posix_spawnattr_t *, char *const[], char *const[]));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_INIT
+#if GNULIB_TEST_POSIX_SPAWNATTR_INIT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_init, int,
                  (posix_spawnattr_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_DESTROY
+#if GNULIB_TEST_POSIX_SPAWNATTR_DESTROY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_destroy, int,
                  (posix_spawnattr_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT
+#if GNULIB_TEST_POSIX_SPAWNATTR_GETSIGDEFAULT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_getsigdefault, int,
                  (const posix_spawnattr_t *, sigset_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT
+#if GNULIB_TEST_POSIX_SPAWNATTR_SETSIGDEFAULT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_setsigdefault, int,
                  (posix_spawnattr_t *, const sigset_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_GETSIGMASK
+#if GNULIB_TEST_POSIX_SPAWNATTR_GETSIGMASK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_getsigmask, int,
                  (const posix_spawnattr_t *, sigset_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_SETSIGMASK
+#if GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_setsigmask, int,
                  (posix_spawnattr_t *, const sigset_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_GETFLAGS
+#if GNULIB_TEST_POSIX_SPAWNATTR_GETFLAGS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_getflags, int,
                  (const posix_spawnattr_t *, short int *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_SETFLAGS
+#if GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_setflags, int,
                  (posix_spawnattr_t *, short int));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_GETPGROUP
+#if GNULIB_TEST_POSIX_SPAWNATTR_GETPGROUP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_getpgroup, int,
                  (const posix_spawnattr_t *, pid_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_SETPGROUP
+#if GNULIB_TEST_POSIX_SPAWNATTR_SETPGROUP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_setpgroup, int,
                  (posix_spawnattr_t *, pid_t));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY
+#if GNULIB_TEST_POSIX_SPAWNATTR_GETSCHEDPOLICY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_getschedpolicy, int,
                  (const posix_spawnattr_t *, int *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY
+#if GNULIB_TEST_POSIX_SPAWNATTR_SETSCHEDPOLICY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_setschedpolicy, int,
                  (posix_spawnattr_t *, int));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM
+#if GNULIB_TEST_POSIX_SPAWNATTR_GETSCHEDPARAM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_getschedparam, int,
                  (const posix_spawnattr_t *, struct sched_param *));
 #endif
 
-#if GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM
+#if GNULIB_TEST_POSIX_SPAWNATTR_SETSCHEDPARAM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawnattr_setschedparam, int,
                  (posix_spawnattr_t *, const struct sched_param *));
 #endif
 
-#if GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT
+#if GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_INIT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawn_file_actions_init, int,
                  (posix_spawn_file_actions_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY
+#if GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_DESTROY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawn_file_actions_destroy, int,
                  (posix_spawn_file_actions_t *));
 #endif
 
-#if GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
+#if GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawn_file_actions_addopen, int,
                  (posix_spawn_file_actions_t *, int, const char *, int,
                   mode_t));
 #endif
 
-#if GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
+#if GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawn_file_actions_addclose, int,
                  (posix_spawn_file_actions_t *, int));
 #endif
 
-#if GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
+#if GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
 SIGNATURE_CHECK (GNULIB_NAMESPACE::posix_spawn_file_actions_adddup2, int,
                  (posix_spawn_file_actions_t *, int, int));
 #endif
diff --git a/tests/test-stdio-c++.cc b/tests/test-stdio-c++.cc
index 7f8cd2b7a..533a72591 100644
--- a/tests/test-stdio-c++.cc
+++ b/tests/test-stdio-c++.cc
@@ -24,76 +24,76 @@
 #include "signature.h"
 
 
-#if GNULIB_DPRINTF
+#if GNULIB_TEST_DPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::dprintf, int, (int, const char *, ...));
 #endif
 
-#if GNULIB_FCLOSE
+#if GNULIB_TEST_FCLOSE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fclose, int, (FILE *));
 #endif
 
-#if GNULIB_FFLUSH
+#if GNULIB_TEST_FFLUSH
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fflush, int, (FILE *));
 #endif
 
-#if GNULIB_FOPEN
+#if GNULIB_TEST_FOPEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fopen, FILE *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_FPRINTF_POSIX || GNULIB_FPRINTF
+#if GNULIB_TEST_FPRINTF_POSIX || GNULIB_TEST_FPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fprintf, int, (FILE *, const char *, ...));
 #endif
 
-#if GNULIB_FPURGE
+#if GNULIB_TEST_FPURGE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fpurge, int, (FILE *));
 #endif
 
-#if GNULIB_FPUTC
+#if GNULIB_TEST_FPUTC
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fputc, int, (int, FILE *));
 #endif
 
-#if GNULIB_FPUTS
+#if GNULIB_TEST_FPUTS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fputs, int, (const char *, FILE *));
 #endif
 
-#if GNULIB_FREOPEN
+#if GNULIB_TEST_FREOPEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::freopen, FILE *,
                  (const char *, const char *, FILE *));
 #endif
 
-#if GNULIB_FSEEK
+#if GNULIB_TEST_FSEEK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fseek, int, (FILE *, long, int));
 #endif
 
-#if GNULIB_FSEEKO
+#if GNULIB_TEST_FSEEKO
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fseeko, int, (FILE *, off_t, int));
 #endif
 
-#if GNULIB_FTELL
+#if GNULIB_TEST_FTELL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ftell, long, (FILE *));
 #endif
 
-#if GNULIB_FTELLO
+#if GNULIB_TEST_FTELLO
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ftello, off_t, (FILE *));
 #endif
 
-#if GNULIB_FWRITE
+#if GNULIB_TEST_FWRITE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fwrite, size_t,
                  (const void *, size_t, size_t, FILE *));
 #endif
 
-#if GNULIB_GETDELIM
+#if GNULIB_TEST_GETDELIM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getdelim, ssize_t,
                  (char **, size_t *, int, FILE *));
 #endif
 
-#if GNULIB_GETLINE
+#if GNULIB_TEST_GETLINE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getline, ssize_t,
                  (char **, size_t *, FILE *));
 #endif
 
-#if GNULIB_OBSTACK_PRINTF || GNULIB_OBSTACK_PRINTF_POSIX
+#if GNULIB_TEST_OBSTACK_PRINTF || GNULIB_TEST_OBSTACK_PRINTF_POSIX
 SIGNATURE_CHECK (GNULIB_NAMESPACE::obstack_printf, int,
                  (struct obstack *, const char *, ...));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::obstack_vprintf, int,
@@ -102,80 +102,80 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::obstack_vprintf, int,
 
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::pclose, int, (FILE *));
 
-#if GNULIB_PERROR
+#if GNULIB_TEST_PERROR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::perror, void, (const char *));
 #endif
 
-#if GNULIB_POPEN
+#if GNULIB_TEST_POPEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::popen, FILE *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_PRINTF_POSIX || GNULIB_PRINTF
+#if GNULIB_TEST_PRINTF_POSIX || GNULIB_TEST_PRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::printf, int, (const char *, ...));
 #endif
 
-#if GNULIB_PUTC
+#if GNULIB_TEST_PUTC
 SIGNATURE_CHECK (GNULIB_NAMESPACE::putc, int, (int, FILE *));
 #endif
 
-#if GNULIB_PUTCHAR
+#if GNULIB_TEST_PUTCHAR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::putchar, int, (int));
 #endif
 
-#if GNULIB_PUTS
+#if GNULIB_TEST_PUTS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::puts, int, (const char *));
 #endif
 
-#if GNULIB_REMOVE
+#if GNULIB_TEST_REMOVE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::remove, int, (const char *));
 #endif
 
-#if GNULIB_RENAME
+#if GNULIB_TEST_RENAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::rename, int, (const char *, const char *));
 #endif
 
-#if GNULIB_RENAMEAT
+#if GNULIB_TEST_RENAMEAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::renameat, int,
                  (int, char const *, int, char const *));
 #endif
 
-#if GNULIB_SNPRINTF
+#if GNULIB_TEST_SNPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::snprintf, int,
                  (char *, size_t, const char *, ...));
 #endif
 
-#if GNULIB_SPRINTF_POSIX
+#if GNULIB_TEST_SPRINTF_POSIX
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sprintf, int, (char *, const char *, ...));
 #endif
 
-#if GNULIB_VASPRINTF
+#if GNULIB_TEST_VASPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::asprintf, int,
                  (char **, const char *, ...));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::vasprintf, int,
                  (char **, const char *, va_list));
 #endif
 
-#if GNULIB_VDPRINTF
+#if GNULIB_TEST_VDPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::vdprintf, int,
                  (int, const char *, va_list));
 #endif
 
-#if GNULIB_VFPRINTF_POSIX || GNULIB_VFPRINTF
+#if GNULIB_TEST_VFPRINTF_POSIX || GNULIB_TEST_VFPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::vfprintf, int,
                  (FILE *, const char *, va_list));
 #endif
 
-#if GNULIB_VPRINTF_POSIX || GNULIB_VPRINTF
+#if GNULIB_TEST_VPRINTF_POSIX || GNULIB_TEST_VPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::vprintf, int, (const char *, va_list));
 #endif
 
-#if GNULIB_VSNPRINTF
+#if GNULIB_TEST_VSNPRINTF
 SIGNATURE_CHECK (GNULIB_NAMESPACE::vsnprintf, int,
                  (char *, size_t, const char *, va_list));
 #endif
 
-#if GNULIB_VSPRINTF_POSIX
+#if GNULIB_TEST_VSPRINTF_POSIX
 SIGNATURE_CHECK (GNULIB_NAMESPACE::vsprintf, int,
                  (char *, const char *, va_list));
 #endif
diff --git a/tests/test-stdlib-c++.cc b/tests/test-stdlib-c++.cc
index c69b35fc7..3874d2767 100644
--- a/tests/test-stdlib-c++.cc
+++ b/tests/test-stdlib-c++.cc
@@ -26,120 +26,120 @@
 
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::atexit, int, (void (*) (void)));
 
-#if GNULIB_ATOLL
+#if GNULIB_TEST_ATOLL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::atoll, long long, (const char *));
 #endif
 
-#if GNULIB_CALLOC_POSIX
+#if GNULIB_TEST_CALLOC_POSIX
 SIGNATURE_CHECK (GNULIB_NAMESPACE::calloc, void *, (size_t, size_t));
 #endif
 
-#if GNULIB_CANONICALIZE_FILE_NAME
+#if GNULIB_TEST_CANONICALIZE_FILE_NAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::canonicalize_file_name, char *,
                  (const char *));
 #endif
 
-#if GNULIB_GETLOADAVG
+#if GNULIB_TEST_GETLOADAVG
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getloadavg, int, (double[], int));
 #endif
 
-#if GNULIB_GETSUBOPT
+#if GNULIB_TEST_GETSUBOPT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getsubopt, int,
                  (char **, char *const *, char **));
 #endif
 
-#if GNULIB_GRANTPT
+#if GNULIB_TEST_GRANTPT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::grantpt, int, (int));
 #endif
 
-#if GNULIB_MALLOC_POSIX
+#if GNULIB_TEST_MALLOC_POSIX
 SIGNATURE_CHECK (GNULIB_NAMESPACE::malloc, void *, (size_t));
 #endif
 
-#if GNULIB_MKDTEMP
+#if GNULIB_TEST_MKDTEMP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkdtemp, char *, (char *));
 #endif
 
-#if GNULIB_MKOSTEMP
+#if GNULIB_TEST_MKOSTEMP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkostemp, int, (char *, int));
 #endif
 
-#if GNULIB_MKOSTEMPS
+#if GNULIB_TEST_MKOSTEMPS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkostemps, int, (char *, int, int));
 #endif
 
-#if GNULIB_MKSTEMP
+#if GNULIB_TEST_MKSTEMP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkstemp, int, (char *));
 #endif
 
-#if GNULIB_MKSTEMPS
+#if GNULIB_TEST_MKSTEMPS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkstemps, int, (char *, int));
 #endif
 
-#if GNULIB_PTSNAME
+#if GNULIB_TEST_PTSNAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ptsname, char *, (int));
 #endif
 
-#if GNULIB_PUTENV
+#if GNULIB_TEST_PUTENV
 SIGNATURE_CHECK (GNULIB_NAMESPACE::putenv, int, (char *));
 #endif
 
-#if GNULIB_RANDOM_R
+#if GNULIB_TEST_RANDOM_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::random_r, int,
                  (struct random_data *, int32_t *));
 #endif
 
-#if GNULIB_RANDOM_R
+#if GNULIB_TEST_RANDOM_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::srandom_r, int,
                  (unsigned int, struct random_data *));
 #endif
 
-#if GNULIB_RANDOM_R
+#if GNULIB_TEST_RANDOM_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::initstate_r, int,
                  (unsigned int, char *, size_t, struct random_data *));
 #endif
 
-#if GNULIB_RANDOM_R
+#if GNULIB_TEST_RANDOM_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::setstate_r, int,
                  (char *, struct random_data *));
 #endif
 
-#if GNULIB_REALLOC_POSIX
+#if GNULIB_TEST_REALLOC_POSIX
 SIGNATURE_CHECK (GNULIB_NAMESPACE::realloc, void *, (void *, size_t));
 #endif
 
-#if GNULIB_REALPATH
+#if GNULIB_TEST_REALPATH
 SIGNATURE_CHECK (GNULIB_NAMESPACE::realpath, char *, (const char *, char *));
 #endif
 
-#if GNULIB_RPMATCH
+#if GNULIB_TEST_RPMATCH
 SIGNATURE_CHECK (GNULIB_NAMESPACE::rpmatch, int, (const char *));
 #endif
 
-#if GNULIB_SETENV
+#if GNULIB_TEST_SETENV
 SIGNATURE_CHECK (GNULIB_NAMESPACE::setenv, int,
                  (const char *, const char *, int));
 #endif
 
-#if GNULIB_STRTOD
+#if GNULIB_TEST_STRTOD
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strtod, double, (const char *, char **));
 #endif
 
-#if GNULIB_STRTOLL
+#if GNULIB_TEST_STRTOLL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoll, long long,
                  (const char *, char **, int));
 #endif
 
-#if GNULIB_STRTOULL
+#if GNULIB_TEST_STRTOULL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoull, unsigned long long,
                  (const char *, char **, int));
 #endif
 
-#if GNULIB_UNLOCKPT
+#if GNULIB_TEST_UNLOCKPT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::unlockpt, int, (int));
 #endif
 
-#if GNULIB_UNSETENV
+#if GNULIB_TEST_UNSETENV
 SIGNATURE_CHECK (GNULIB_NAMESPACE::unsetenv, int, (const char *));
 #endif
 
diff --git a/tests/test-string-c++.cc b/tests/test-string-c++.cc
index 075f78db8..ee6580f04 100644
--- a/tests/test-string-c++.cc
+++ b/tests/test-string-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_MEMCHR
+#if GNULIB_TEST_MEMCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::memchr, void *,
                  (void const *, int, size_t));
 #endif
@@ -32,100 +32,100 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::memchr, void *,
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::memcmp, int,
 //                 (void const *, void const *, size_t));
 
-#if GNULIB_MEMMEM
+#if GNULIB_TEST_MEMMEM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::memmem, void *,
                  (void const *, size_t, void const *, size_t));
 #endif
 
-#if GNULIB_MEMPCPY
+#if GNULIB_TEST_MEMPCPY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mempcpy, void *,
                  (void *, void const *, size_t));
 #endif
 
-#if GNULIB_MEMRCHR
+#if GNULIB_TEST_MEMRCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::memrchr, void *,
                  (void const *, int, size_t));
 #endif
 
-#if GNULIB_RAWMEMCHR
+#if GNULIB_TEST_RAWMEMCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::rawmemchr, void *, (void const *, int));
 #endif
 
-#if GNULIB_STPCPY
+#if GNULIB_TEST_STPCPY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::stpcpy, char *, (char *, char const *));
 #endif
 
-#if GNULIB_STPNCPY
+#if GNULIB_TEST_STPNCPY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::stpncpy, char *,
                  (char *, char const *, size_t));
 #endif
 
-#if GNULIB_STRCHRNUL
+#if GNULIB_TEST_STRCHRNUL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strchrnul, char *, (char const *, int));
 #endif
 
-#if GNULIB_STRDUP
+#if GNULIB_TEST_STRDUP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strdup, char *, (char const *));
 #endif
 
-#if GNULIB_STRNDUP
+#if GNULIB_TEST_STRNDUP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strndup, char *, (char const *, size_t));
 #endif
 
-#if GNULIB_STRNLEN
+#if GNULIB_TEST_STRNLEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strnlen, size_t, (char const *, size_t));
 #endif
 
-#if GNULIB_STRPBRK
+#if GNULIB_TEST_STRPBRK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strpbrk, char *,
                  (char const *, char const *));
 #endif
 
-#if GNULIB_STRSEP
+#if GNULIB_TEST_STRSEP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strsep, char *, (char **, char const *));
 #endif
 
-#if GNULIB_STRSTR
+#if GNULIB_TEST_STRSTR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strstr, char *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_STRCASESTR
+#if GNULIB_TEST_STRCASESTR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strcasestr, char *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_STRTOK_R
+#if GNULIB_TEST_STRTOK_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strtok_r, char *,
                  (char *, char const *, char **));
 #endif
 
-#if GNULIB_MBSLEN
+#if GNULIB_TEST_MBSLEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbslen, size_t, (const char *));
 #endif
 
-#if GNULIB_MBSCHR
+#if GNULIB_TEST_MBSCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbschr, char *, (const char *, int));
 #endif
 
-#if GNULIB_MBSRCHR
+#if GNULIB_TEST_MBSRCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrchr, char *, (const char *, int));
 #endif
 
-#if GNULIB_MBSPBRK
+#if GNULIB_TEST_MBSPBRK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbspbrk, char *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_STRERROR
+#if GNULIB_TEST_STRERROR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strerror, char *, (int));
 #endif
 
-#if GNULIB_STRSIGNAL
+#if GNULIB_TEST_STRSIGNAL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strsignal, char *, (int));
 #endif
 
-#if GNULIB_STRVERSCMP
+#if GNULIB_TEST_STRVERSCMP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strverscmp, int,
                  (const char *, const char *));
 #endif
diff --git a/tests/test-sys_ioctl-c++.cc b/tests/test-sys_ioctl-c++.cc
index 0be262eb3..3ed5531a2 100644
--- a/tests/test-sys_ioctl-c++.cc
+++ b/tests/test-sys_ioctl-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_IOCTL
+#if GNULIB_TEST_IOCTL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ioctl, int, (int, int, ...));
 #endif
 
diff --git a/tests/test-sys_select-c++.cc b/tests/test-sys_select-c++.cc
index fcf867a18..56898115d 100644
--- a/tests/test-sys_select-c++.cc
+++ b/tests/test-sys_select-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_SELECT
+#if GNULIB_TEST_SELECT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::select, int,
                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
 #endif
diff --git a/tests/test-sys_socket-c++.cc b/tests/test-sys_socket-c++.cc
index 808d35ae6..2fc9ea638 100644
--- a/tests/test-sys_socket-c++.cc
+++ b/tests/test-sys_socket-c++.cc
@@ -24,74 +24,74 @@
 #include "signature.h"
 
 
-#if GNULIB_SOCKET
+#if GNULIB_TEST_SOCKET
 SIGNATURE_CHECK (GNULIB_NAMESPACE::socket, int, (int, int, int));
 #endif
 
-#if GNULIB_CONNECT
+#if GNULIB_TEST_CONNECT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::connect, int,
                  (int, const struct sockaddr *, socklen_t));
 #endif
 
-#if GNULIB_ACCEPT
+#if GNULIB_TEST_ACCEPT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::accept, int,
                  (int, struct sockaddr *, socklen_t *));
 #endif
 
-#if GNULIB_BIND
+#if GNULIB_TEST_BIND
 SIGNATURE_CHECK (GNULIB_NAMESPACE::bind, int,
                  (int, const struct sockaddr *, socklen_t));
 #endif
 
-#if GNULIB_GETPEERNAME
+#if GNULIB_TEST_GETPEERNAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getpeername, int,
                  (int, struct sockaddr *, socklen_t *));
 #endif
 
-#if GNULIB_GETSOCKNAME
+#if GNULIB_TEST_GETSOCKNAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getsockname, int,
                  (int, struct sockaddr *, socklen_t *));
 #endif
 
-#if GNULIB_GETSOCKOPT
+#if GNULIB_TEST_GETSOCKOPT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getsockopt, int,
                  (int, int, int, void *, socklen_t *));
 #endif
 
-#if GNULIB_LISTEN
+#if GNULIB_TEST_LISTEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::listen, int, (int, int));
 #endif
 
-#if GNULIB_RECV
+#if GNULIB_TEST_RECV
 SIGNATURE_CHECK (GNULIB_NAMESPACE::recv, ssize_t, (int, void *, size_t, int));
 #endif
 
-#if GNULIB_SEND
+#if GNULIB_TEST_SEND
 SIGNATURE_CHECK (GNULIB_NAMESPACE::send, ssize_t,
                  (int, const void *, size_t, int));
 #endif
 
-#if GNULIB_RECVFROM
+#if GNULIB_TEST_RECVFROM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::recvfrom, ssize_t,
                  (int, void *, size_t, int, struct sockaddr *, socklen_t *));
 #endif
 
-#if GNULIB_SENDTO
+#if GNULIB_TEST_SENDTO
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sendto, ssize_t,
                  (int, const void *, size_t, int,
                   const struct sockaddr *, socklen_t));
 #endif
 
-#if GNULIB_SETSOCKOPT
+#if GNULIB_TEST_SETSOCKOPT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::setsockopt, int,
                  (int, int, int, const void *, socklen_t));
 #endif
 
-#if GNULIB_SHUTDOWN
+#if GNULIB_TEST_SHUTDOWN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::shutdown, int, (int, int));
 #endif
 
-#if GNULIB_ACCEPT4
+#if GNULIB_TEST_ACCEPT4
 SIGNATURE_CHECK (GNULIB_NAMESPACE::accept4, int,
                  (int, struct sockaddr *, socklen_t *, int));
 #endif
diff --git a/tests/test-sys_stat-c++.cc b/tests/test-sys_stat-c++.cc
index 8bfafad0d..8d4c465d8 100644
--- a/tests/test-sys_stat-c++.cc
+++ b/tests/test-sys_stat-c++.cc
@@ -24,59 +24,59 @@
 #include "signature.h"
 
 
-#if GNULIB_FCHMODAT
+#if GNULIB_TEST_FCHMODAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fchmodat, int,
                  (int, char const *, mode_t, int));
 #endif
 
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fstat, int, (int, struct stat *));
 
-#if GNULIB_FSTATAT
+#if GNULIB_TEST_FSTATAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fstatat, int,
                  (int, char const *, struct stat *, int));
 #endif
 
-#if GNULIB_FUTIMENS
+#if GNULIB_TEST_FUTIMENS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::futimens, int,
                  (int, struct timespec const[2]));
 #endif
 
-#if GNULIB_LCHMOD
+#if GNULIB_TEST_LCHMOD
 SIGNATURE_CHECK (GNULIB_NAMESPACE::lchmod, int, (const char *, mode_t));
 #endif
 
-#if GNULIB_LSTAT
+#if GNULIB_TEST_LSTAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::lstat, int, (const char *, struct stat *));
 #endif
 
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkdir, int, (char const *, mode_t));
 
-#if GNULIB_MKDIRAT
+#if GNULIB_TEST_MKDIRAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkdirat, int, (int, char const *, mode_t));
 #endif
 
-#if GNULIB_MKFIFO
+#if GNULIB_TEST_MKFIFO
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkfifo, int, (char const *, mode_t));
 #endif
 
-#if GNULIB_MKFIFOAT
+#if GNULIB_TEST_MKFIFOAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mkfifoat, int, (int, char const *, mode_t));
 #endif
 
-#if GNULIB_MKNOD
+#if GNULIB_TEST_MKNOD
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mknod, int, (char const *, mode_t, dev_t));
 #endif
 
-#if GNULIB_MKNODAT
+#if GNULIB_TEST_MKNODAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mknodat, int,
                  (int, char const *, mode_t, dev_t));
 #endif
 
-#if GNULIB_STAT
+#if GNULIB_TEST_STAT
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::stat, int, (const char *, struct stat *));
 #endif
 
-#if GNULIB_UTIMENSAT
+#if GNULIB_TEST_UTIMENSAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::utimensat, int,
                  (int, char const *, struct timespec const[2], int));
 #endif
diff --git a/tests/test-sys_time-c++.cc b/tests/test-sys_time-c++.cc
index 58724f31f..c85fc79f9 100644
--- a/tests/test-sys_time-c++.cc
+++ b/tests/test-sys_time-c++.cc
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_GETTIMEOFDAY
+#if GNULIB_TEST_GETTIMEOFDAY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::gettimeofday, int,
                  (struct timeval *, void *));
 #endif
diff --git a/tests/test-time-c++.cc b/tests/test-time-c++.cc
index bb6fd20b9..deb1860f1 100644
--- a/tests/test-time-c++.cc
+++ b/tests/test-time-c++.cc
@@ -24,16 +24,16 @@
 #include "signature.h"
 
 
-#if GNULIB_NANOSLEEP
+#if GNULIB_TEST_NANOSLEEP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::nanosleep, int,
                  (struct timespec const *, struct timespec *));
 #endif
 
-#if GNULIB_MKTIME
+#if GNULIB_TEST_MKTIME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime, time_t, (struct tm *));
 #endif
 
-#if GNULIB_TIME_R
+#if GNULIB_TEST_TIME_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_r, struct tm *,
                  (time_t const *, struct tm *));
 
@@ -41,12 +41,12 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime_r, struct tm *,
                  (time_t const *, struct tm *));
 #endif
 
-#if GNULIB_STRPTIME
+#if GNULIB_TEST_STRPTIME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strptime, char *,
                  (char const *, char const *, struct tm *));
 #endif
 
-#if GNULIB_TIMEGM
+#if GNULIB_TEST_TIMEGM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::timegm, time_t, (struct tm *));
 #endif
 
diff --git a/tests/test-unistd-c++.cc b/tests/test-unistd-c++.cc
index f185e1b9a..425731a9b 100644
--- a/tests/test-unistd-c++.cc
+++ b/tests/test-unistd-c++.cc
@@ -24,165 +24,165 @@
 #include "signature.h"
 
 
-#if GNULIB_CHOWN
+#if GNULIB_TEST_CHOWN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::chown, int, (const char *, uid_t, gid_t));
 #endif
 
-#if GNULIB_CLOSE
+#if GNULIB_TEST_CLOSE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::close, int, (int));
 #endif
 
 SIGNATURE_CHECK (GNULIB_NAMESPACE::dup, int, (int));
 
-#if GNULIB_DUP2
+#if GNULIB_TEST_DUP2
 SIGNATURE_CHECK (GNULIB_NAMESPACE::dup2, int, (int, int));
 #endif
 
-#if GNULIB_DUP3
+#if GNULIB_TEST_DUP3
 SIGNATURE_CHECK (GNULIB_NAMESPACE::dup3, int, (int, int, int));
 #endif
 
-#if GNULIB_EUIDACCESS
+#if GNULIB_TEST_EUIDACCESS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::euidaccess, int, (const char *, int));
 #endif
 
-#if GNULIB_FACCESSAT
+#if GNULIB_TEST_FACCESSAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::faccessat, int,
                  (int, char const *, int, int));
 #endif
 
-#if GNULIB_FCHDIR
+#if GNULIB_TEST_FCHDIR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fchdir, int, (int));
 #endif
 
-#if GNULIB_FCHOWNAT
+#if GNULIB_TEST_FCHOWNAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fchownat, int,
                  (int, char const *, uid_t, gid_t, int));
 #endif
 
-#if GNULIB_FSYNC
+#if GNULIB_TEST_FSYNC
 SIGNATURE_CHECK (GNULIB_NAMESPACE::fsync, int, (int));
 #endif
 
-#if GNULIB_FTRUNCATE
+#if GNULIB_TEST_FTRUNCATE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ftruncate, int, (int, off_t));
 #endif
 
-#if GNULIB_GETCWD
+#if GNULIB_TEST_GETCWD
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getcwd, char *, (char *, size_t));
 #endif
 
-#if GNULIB_GETDOMAINNAME
+#if GNULIB_TEST_GETDOMAINNAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getdomainname, int, (char *, size_t));
 #endif
 
-#if GNULIB_GETDTABLESIZE
+#if GNULIB_TEST_GETDTABLESIZE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getdtablesize, int, (void));
 #endif
 
-#if GNULIB_GETGROUPS
+#if GNULIB_TEST_GETGROUPS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getgroups, int, (int, gid_t *));
 #endif
 
-#if GNULIB_GETHOSTNAME
+#if GNULIB_TEST_GETHOSTNAME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::gethostname, int, (char *, size_t));
 #endif
 
-#if GNULIB_GETLOGIN
+#if GNULIB_TEST_GETLOGIN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getlogin, char *, (void));
 #endif
 
-#if GNULIB_GETLOGIN_R
+#if GNULIB_TEST_GETLOGIN_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getlogin_r, int, (char *, size_t));
 #endif
 
-#if GNULIB_GETPAGESIZE
+#if GNULIB_TEST_GETPAGESIZE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getpagesize, int, (void));
 #endif
 
-#if GNULIB_GETUSERSHELL
+#if GNULIB_TEST_GETUSERSHELL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::getusershell, char *, (void));
 #endif
 
-#if GNULIB_GETUSERSHELL
+#if GNULIB_TEST_GETUSERSHELL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::setusershell, void, (void));
 #endif
 
-#if GNULIB_GETUSERSHELL
+#if GNULIB_TEST_GETUSERSHELL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::endusershell, void, (void));
 #endif
 
-#if GNULIB_LCHOWN
+#if GNULIB_TEST_LCHOWN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::lchown, int, (char const *, uid_t, gid_t));
 #endif
 
-#if GNULIB_LINK
+#if GNULIB_TEST_LINK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::link, int, (const char *, const char *));
 #endif
 
-#if GNULIB_LINKAT
+#if GNULIB_TEST_LINKAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::linkat, int,
                  (int, const char *, int, const char *, int));
 #endif
 
-#if GNULIB_LSEEK
+#if GNULIB_TEST_LSEEK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::lseek, off_t, (int, off_t, int));
 #endif
 
-#if GNULIB_PIPE2
+#if GNULIB_TEST_PIPE2
 SIGNATURE_CHECK (GNULIB_NAMESPACE::pipe2, int, (int[2], int));
 #endif
 
-#if GNULIB_PREAD
+#if GNULIB_TEST_PREAD
 SIGNATURE_CHECK (GNULIB_NAMESPACE::pread, ssize_t,
                  (int, void *, size_t, off_t));
 #endif
 
-#if GNULIB_READLINK
+#if GNULIB_TEST_READLINK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::readlink, ssize_t,
                  (const char *, char *, size_t));
 #endif
 
-#if GNULIB_READLINKAT
+#if GNULIB_TEST_READLINKAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::readlinkat, ssize_t,
                  (int, char const *, char *, size_t));
 #endif
 
-#if GNULIB_RMDIR
+#if GNULIB_TEST_RMDIR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::rmdir, int, (char const *));
 #endif
 
-#if GNULIB_SLEEP
+#if GNULIB_TEST_SLEEP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::sleep, unsigned int, (unsigned int));
 #endif
 
-#if GNULIB_SYMLINK
+#if GNULIB_TEST_SYMLINK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::symlink, int, (char const *, char const *));
 #endif
 
-#if GNULIB_SYMLINKAT
+#if GNULIB_TEST_SYMLINKAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::symlinkat, int,
                  (char const *, int, char const *));
 #endif
 
-#if GNULIB_TTYNAME_R
+#if GNULIB_TEST_TTYNAME_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::ttyname_r, int,
                  (int fd, char *buf, size_t buflen));
 #endif
 
-#if GNULIB_UNLINK
+#if GNULIB_TEST_UNLINK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::unlink, int, (char const *));
 #endif
 
-#if GNULIB_UNLINKAT
+#if GNULIB_TEST_UNLINKAT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::unlinkat, int, (int, char const *, int));
 #endif
 
-#if GNULIB_USLEEP
+#if GNULIB_TEST_USLEEP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::usleep, int, (useconds_t));
 #endif
 
-#if GNULIB_WRITE
+#if GNULIB_TEST_WRITE
 SIGNATURE_CHECK (GNULIB_NAMESPACE::write, ssize_t,
                  (int, const void *, size_t));
 #endif
diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc
index 7cfce9bf0..1f2bef150 100644
--- a/tests/test-wchar-c++.cc
+++ b/tests/test-wchar-c++.cc
@@ -24,54 +24,54 @@
 #include "signature.h"
 
 
-#if GNULIB_BTOWC
+#if GNULIB_TEST_BTOWC
 SIGNATURE_CHECK (GNULIB_NAMESPACE::btowc, wint_t, (int));
 #endif
 
-#if GNULIB_WCTOB
+#if GNULIB_TEST_WCTOB
 SIGNATURE_CHECK (GNULIB_NAMESPACE::wctob, int, (wint_t));
 #endif
 
-#if GNULIB_MBSINIT
+#if GNULIB_TEST_MBSINIT
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsinit, int, (const mbstate_t *));
 #endif
 
-#if GNULIB_MBRTOWC
+#if GNULIB_TEST_MBRTOWC
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrtowc, size_t,
                  (wchar_t *, const char *, size_t, mbstate_t *));
 #endif
 
-#if GNULIB_MBRLEN
+#if GNULIB_TEST_MBRLEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrlen, size_t,
                  (const char *, size_t, mbstate_t *));
 #endif
 
-#if GNULIB_MBSRTOWCS
+#if GNULIB_TEST_MBSRTOWCS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtowcs, size_t,
                  (wchar_t *, const char **, size_t, mbstate_t *));
 #endif
 
-#if GNULIB_MBSNRTOWCS
+#if GNULIB_TEST_MBSNRTOWCS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsnrtowcs, size_t,
                  (wchar_t *, const char **, size_t, size_t, mbstate_t *));
 #endif
 
-#if GNULIB_WCRTOMB
+#if GNULIB_TEST_WCRTOMB
 SIGNATURE_CHECK (GNULIB_NAMESPACE::wcrtomb, size_t,
                  (char *, wchar_t, mbstate_t *));
 #endif
 
-#if GNULIB_WCSRTOMBS
+#if GNULIB_TEST_WCSRTOMBS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsrtombs, size_t,
                  (char *, const wchar_t **, size_t, mbstate_t *));
 #endif
 
-#if GNULIB_WCSNRTOMBS
+#if GNULIB_TEST_WCSNRTOMBS
 SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnrtombs, size_t,
                  (char *, const wchar_t **, size_t, size_t, mbstate_t *));
 #endif
 
-#if GNULIB_WCWIDTH
+#if GNULIB_TEST_WCWIDTH
 SIGNATURE_CHECK (GNULIB_NAMESPACE::wcwidth, int, (wchar_t));
 #endif
 
diff --git a/tests/uninorm/test-u16-nfc.c b/tests/uninorm/test-u16-nfc.c
index 5910de2f3..b5955003d 100644
--- a/tests/uninorm/test-u16-nfc.c
+++ b/tests/uninorm/test-u16-nfc.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U16_NORMALIZE
+#if GNULIB_TEST_UNINORM_U16_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u16-nfd.c b/tests/uninorm/test-u16-nfd.c
index 4485e3e9e..0e084c919 100644
--- a/tests/uninorm/test-u16-nfd.c
+++ b/tests/uninorm/test-u16-nfd.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U16_NORMALIZE
+#if GNULIB_TEST_UNINORM_U16_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u16-nfkc.c b/tests/uninorm/test-u16-nfkc.c
index a9b673df8..7fcec7c59 100644
--- a/tests/uninorm/test-u16-nfkc.c
+++ b/tests/uninorm/test-u16-nfkc.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U16_NORMALIZE
+#if GNULIB_TEST_UNINORM_U16_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u16-nfkd.c b/tests/uninorm/test-u16-nfkd.c
index d729aa313..4395d01c2 100644
--- a/tests/uninorm/test-u16-nfkd.c
+++ b/tests/uninorm/test-u16-nfkd.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U16_NORMALIZE
+#if GNULIB_TEST_UNINORM_U16_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfc-big.c b/tests/uninorm/test-u32-nfc-big.c
index 77eba6e8d..dee58060c 100644
--- a/tests/uninorm/test-u32-nfc-big.c
+++ b/tests/uninorm/test-u32-nfc-big.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfc.c b/tests/uninorm/test-u32-nfc.c
index 1c6227593..b154c8ba1 100644
--- a/tests/uninorm/test-u32-nfc.c
+++ b/tests/uninorm/test-u32-nfc.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfd-big.c b/tests/uninorm/test-u32-nfd-big.c
index bd2489ca9..ccc129186 100644
--- a/tests/uninorm/test-u32-nfd-big.c
+++ b/tests/uninorm/test-u32-nfd-big.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfd.c b/tests/uninorm/test-u32-nfd.c
index 027b06a70..58c97b2b1 100644
--- a/tests/uninorm/test-u32-nfd.c
+++ b/tests/uninorm/test-u32-nfd.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfkc-big.c b/tests/uninorm/test-u32-nfkc-big.c
index 8454f6856..7827d33b7 100644
--- a/tests/uninorm/test-u32-nfkc-big.c
+++ b/tests/uninorm/test-u32-nfkc-big.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfkc.c b/tests/uninorm/test-u32-nfkc.c
index ba98f13a5..eb4d3ce7d 100644
--- a/tests/uninorm/test-u32-nfkc.c
+++ b/tests/uninorm/test-u32-nfkc.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfkd-big.c b/tests/uninorm/test-u32-nfkd-big.c
index f6fab5017..14232c55b 100644
--- a/tests/uninorm/test-u32-nfkd-big.c
+++ b/tests/uninorm/test-u32-nfkd-big.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-nfkd.c b/tests/uninorm/test-u32-nfkd.c
index be4d54a8b..b98f65121 100644
--- a/tests/uninorm/test-u32-nfkd.c
+++ b/tests/uninorm/test-u32-nfkd.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u32-normalize-big.c b/tests/uninorm/test-u32-normalize-big.c
index 1d1bd3e04..6c637862e 100644
--- a/tests/uninorm/test-u32-normalize-big.c
+++ b/tests/uninorm/test-u32-normalize-big.c
@@ -21,7 +21,7 @@
 /* Specification.  */
 #include "test-u32-normalize-big.h"
 
-#if GNULIB_UNINORM_U32_NORMALIZE
+#if GNULIB_TEST_UNINORM_U32_NORMALIZE
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/uninorm/test-u8-nfc.c b/tests/uninorm/test-u8-nfc.c
index 1697e9138..1a7745cfb 100644
--- a/tests/uninorm/test-u8-nfc.c
+++ b/tests/uninorm/test-u8-nfc.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U8_NORMALIZE
+#if GNULIB_TEST_UNINORM_U8_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u8-nfd.c b/tests/uninorm/test-u8-nfd.c
index 8e4678f83..082ded4a3 100644
--- a/tests/uninorm/test-u8-nfd.c
+++ b/tests/uninorm/test-u8-nfd.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U8_NORMALIZE
+#if GNULIB_TEST_UNINORM_U8_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u8-nfkc.c b/tests/uninorm/test-u8-nfkc.c
index 38189d5d5..1ca1413b9 100644
--- a/tests/uninorm/test-u8-nfkc.c
+++ b/tests/uninorm/test-u8-nfkc.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U8_NORMALIZE
+#if GNULIB_TEST_UNINORM_U8_NORMALIZE
 
 #include "uninorm.h"
 
diff --git a/tests/uninorm/test-u8-nfkd.c b/tests/uninorm/test-u8-nfkd.c
index fb1df7db6..2e2953903 100644
--- a/tests/uninorm/test-u8-nfkd.c
+++ b/tests/uninorm/test-u8-nfkd.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if GNULIB_UNINORM_U8_NORMALIZE
+#if GNULIB_TEST_UNINORM_U8_NORMALIZE
 
 #include "uninorm.h"
 
-- 
2.11.0