Resolve conflict between the two kinds of module indicators.

diff --git a/ChangeLog b/ChangeLog
index 6b297760519c37a5a9f5eb2f3e98c1ae69766881..a85ba5928a5b724840375af21b52b3fbde297fbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+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.

diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 09ea950e26aeada3d53b448fdf7995ebbf8c30c8..f8e32e39f5a0d9adeb93286ef9593fb1ef5cd02d 100644 (file)
--- 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 39a5102e32691b6f2014fc4db4b956cec954ab58..4ed943bd8783344b114a6ad364fc48ac2025e7c3 100644 (file)
--- 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 cbf481d39a76dcd9dcc2ac2716142348b4c371b0..6a5c45d7663ef60eef911e9735c56fa60b465eff 100644 (file)
--- 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 7e0263c99040a9f0f7a2be1cf2e31afdefa6ab49..ed58c7cf4ea719390cff26fee8a886e22bb36abd 100644 (file)
--- 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 1a83eeac7b2031b41dfab20f3f1d46382012a0fc..dc8b6a229f2f3dd66e7c5b5b06a18b1a90bf0a0f 100644 (file)
--- 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 3bad63a00916fee261c0d929b373b954e0942c80..cef9a304d60ac21e9c45a4ac9dcfffa17bb79346 100644 (file)
--- 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 fca3ccd624f637f346c8a967a6da7569ddb85cdb..145cafb9d250dedc1f542ccd783afdb9068928a7 100644 (file)
--- 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 8b694259974bb5e674e1dbdf4fcbce8b0d6813c0..6e8b246a237f59ae505e64d302fb79dc5a4c6a49 100644 (file)
--- 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 6bcb8e6ae4a933ff69cfce66dced6ca7dd3a9db4..86fe566401af2919fc3c921cb1a65d5b55df2129 100644 (file)
--- 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 0db8f1c6f1713537da750fdea9681b33f11541b1..96db7a5f8b83f679772ea11ba051891b06b4bfd9 100644 (file)
--- 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 6d9c918514f06bdbafe843b7b28dfd097d1c52bd..a0424fe2f8a7dc93532da39433a290e8cf7f4691 100644 (file)
--- 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 e04a235e2efa8ecd13cc159e1eb03c326910a918..314923c457a4f828d7cb874be96bf6da2de4c126 100644 (file)
--- 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 9772a163895771d302e4ed29e15552ad962089a2..8be774b81c6d2e71723c8f96e55ffc9f448b3b87 100644 (file)
--- 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 1f1cefe7665070abc483921d14dfddf6130d4aa6..26b3a3434028203d275261803a61ed98982524a9 100644 (file)
--- 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 0437b8f58da98a5082d315454f6e1bc7fa7fa429..d2d94a23d2954fd5f93491bbda1e0bebe519f24e 100644 (file)
--- 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 e5457aeeec0ce45a5967a4fb838cc699f5f71d3a..fa06021101c55462a629d9f2b0515e0f15a6fb10 100644 (file)
--- 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 11d4766f72bb2095debe3881c367b831739d578f..f2bc9f67231b3fe852d53aaeb91c798277d388a6 100644 (file)
--- 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 7f8cd2b7a059cd9ff86bc219e088eb5e986c1a23..533a72591b2cc2b0bb4012371493157762de7718 100644 (file)
--- 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 c69b35fc732a9ec5121fbcdf507cf905c0a5f293..3874d2767f7b0ff00c47218b2c3b87f2a6023eda 100644 (file)
--- 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 075f78db80ed4de558976a37cad38033eb84d66e..ee6580f0437d3402e194d9aa5f3ac7da715b5c58 100644 (file)
--- 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 0be262eb3980851b381257c14a34d9d47c750b4a..3ed5531a23d6a73f13903105d906139a16f8f0cb 100644 (file)
--- 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 fcf867a186dba2d3ecd834247f783b4ad5bfa1ad..56898115d8495d83dab6c1b9b235d2b3c14be570 100644 (file)
--- 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 808d35ae67daf172347555c118d62b529ae65281..2fc9ea63891f4fdf641952f617e89bcf7121efaf 100644 (file)
--- 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 8bfafad0d051543ab7975316eff6f51e6ba1de18..8d4c465d82f04f059ccf4f1b5b2b6d6820ad970e 100644 (file)
--- 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 58724f31f0e461f63321bcd2b6d9a8cd29582baf..c85fc79f9e13197b566dfe49be81c62420f53f97 100644 (file)
--- 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 bb6fd20b90d5289c0aab84401db372db9ea468b0..deb1860f1b3e7e2e1012e2a05780b5441241a1a2 100644 (file)
--- 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 f185e1b9a5f8a2a71c1fd6a3a72c5340570af223..425731a9bb8c1828e95dd0ac8f539e5b46405c5a 100644 (file)
--- 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 7cfce9bf011a1d0a8f61bcde8b7e683a330d597d..1f2bef150fb05a05e0577e82cb25d5c3961c2f7d 100644 (file)
--- 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 5910de2f3a696e83fd6d241e4279ea724aa92d83..b5955003d9e78cfcc2ffc3d4b2ed564b50e90e7e 100644 (file)
--- 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 4485e3e9e816510f351ce28470e8706bd551435d..0e084c9194ac3f231798eb98ce1ac49cf2c09080 100644 (file)
--- 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 a9b673df8a9cfe7f37c6e3cd2ff2223c675fd6db..7fcec7c59b5436d17824e12c87126f632b57f367 100644 (file)
--- 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 d729aa313aeb97018724b243bd0b5b426bb1b24d..4395d01c2a8801984ccb1fdc70665e2bab443218 100644 (file)
--- 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 77eba6e8d28f866390bb7137f2bf1ceff0661533..dee58060c9411b00d7c12f146a1e89a72c14d510 100644 (file)
--- 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 1c622759313c9d84f5500f9d6745b7ec77926411..b154c8ba11e193fdff7db8e904efb4055e21917f 100644 (file)
--- 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 bd2489ca9c4dc77e85d472c1848e0f9d320bf3e7..ccc1291864176ad8758fb07460d3f3b9c6379ead 100644 (file)
--- 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 027b06a70bfbf731ecc4ada0626a5fce28e1d5c1..58c97b2b1f26f50477eb2d47655d75aad291f672 100644 (file)
--- 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 8454f6856fa4f9edd6343b671a2af5c1e2257e64..7827d33b79abce5930aac1913f28bed6275c3cf2 100644 (file)
--- 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 ba98f13a5e8db5ffe5a4a2e6025b24eef3b53585..eb4d3ce7d5884b88d5c7e227036fb86e3edba6c3 100644 (file)
--- 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 f6fab50172ef8e1f4774297c0d28f488e4eb99d4..14232c55bb140d51d3719b15c7a44c7e5260cd93 100644 (file)
--- 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 be4d54a8be877b8779225069d75bb73cee5aab29..b98f651211b795366bf76bbc5150cb96042ab974 100644 (file)
--- 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 1d1bd3e0460c042103cdd95373732b111c9a4c3c..6c637862eed81ffe19cb200210a0615eabe2a9a0 100644 (file)
--- 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 1697e91386dc2ef9e01cbcdd962fa357703ff34d..1a7745cfb94453e28da35e63f6430bff0d327f29 100644 (file)
--- 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 8e4678f83ef4191843c872a3cff67583e342f50a..082ded4a35b26280b0efe154288f5353cc520c97 100644 (file)
--- 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 38189d5d5d38a29410ae170c9ed0eb8372ad3664..1ca1413b9ff3ae29eb8813fe528774b357e72b85 100644 (file)
--- 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 fb1df7db6080b927e573c5c1dcbf8f196755e1f9..2e2953903b04f58f07fd0a6124c04cdc6dddd5cf 100644 (file)
--- 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"