Tests of module 'sys_time' in C++ mode.

diff --git a/ChangeLog b/ChangeLog
index 364d23dcceb8504b9ebd57c6ead729be3e1b9970..4b67af4b85500f24426adef219c962df2c0ad5df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-03-07  Bruno Haible  <bruno@clisp.org>
 
+       Tests of module 'sys_time' in C++ mode.
+       * tests/test-sys_time-c++.cc: New file.
+       * modules/sys_time-tests (Files): Add it and tests/signature.h.
+       (Depends-on): Add ansi-c++-opt.
+       (Makefile.am): Arrange to compile and run test-sys_time-c++.
+       * m4/sys_time_h.m4 (gl_SYS_TIME_MODULE_INDICATOR): Invoke
+       gl_MODULE_INDICATOR.
+
        Tests of module 'sys_stat' in C++ mode.
        * tests/test-sys_stat-c++.cc: New file.
        * modules/sys_stat-tests (Files): Add it and tests/signature.h.

diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index be6d7ecbfa49dc6b986de3091d25cf2cf78f7bfb..2835a40c266639c6db1c75bda9513b1309676571 100644 (file)
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,5 +1,5 @@
 # Configure a replacement for <sys/time.h>.
-# serial 4
+# serial 5
 
 # Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -57,6 +57,8 @@ AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR],
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
   GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR([$1])
 ])
 
 AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],

diff --git a/modules/sys_time-tests b/modules/sys_time-tests
index dd1bff48b01e96a1cc70d3916acd71471f32ed97..722499e8b57d3d706549e21972df62b96818123f 100644 (file)
--- a/modules/sys_time-tests
+++ b/modules/sys_time-tests
@@ -1,10 +1,19 @@
 Files:
 tests/test-sys_time.c
+tests/test-sys_time-c++.cc
+tests/signature.h
 
 Depends-on:
+ansi-c++-opt
 
 configure.ac:
 
 Makefile.am:
 TESTS += test-sys_time
 check_PROGRAMS += test-sys_time
+if ANSICXX
+TESTS += test-sys_time-c++
+check_PROGRAMS += test-sys_time-c++
+test_sys_time_c___SOURCES = test-sys_time-c++.cc
+test_sys_time_c___LDADD = $(LDADD) $(LIBINTL)
+endif

diff --git a/tests/test-sys_time-c++.cc b/tests/test-sys_time-c++.cc
new file mode 100644 (file)
index 0000000..58724f3
--- /dev/null
+++ b/tests/test-sys_time-c++.cc
@@ -0,0 +1,36 @@
+/* Test of <sys/time.h> substitute in C++ mode.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2010.  */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#include <sys/time.h>
+
+#include "signature.h"
+
+
+#if GNULIB_GETTIMEOFDAY
+SIGNATURE_CHECK (GNULIB_NAMESPACE::gettimeofday, int,
+                 (struct timeval *, void *));
+#endif
+
+
+int
+main ()
+{
+}