From b0735c93bed74006d3f5e00a091819288ce341ea Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Mon, 8 Mar 2010 02:48:21 +0100
Subject: [PATCH] Tests of module 'sys_ioctl' in C++ mode.
---
ChangeLog | 8 ++++++++
m4/sys_ioctl_h.m4 | 4 +++-
modules/sys_ioctl-tests | 9 +++++++++
tests/test-sys_ioctl-c++.cc | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 tests/test-sys_ioctl-c++.cc
diff --git a/ChangeLog b/ChangeLog
index b696de8027..ed470c2ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-03-07 Bruno Haible <bruno@clisp.org>
+ Tests of module 'sys_ioctl' in C++ mode.
+ * tests/test-sys_ioctl-c++.cc: New file.
+ * modules/sys_ioctl-tests (Files): Add it and tests/signature.h.
+ (Depends-on): Add ansi-c++-opt.
+ (Makefile.am): Arrange to compile and run test-sys_ioctl-c++.
+ * m4/sys_ioctl_h.m4 (gl_SYS_IOCTL_MODULE_INDICATOR): Invoke
+ gl_MODULE_INDICATOR.
+
Tests of module 'string' in C++ mode.
* tests/test-string-c++.cc: New file.
* modules/string-tests (Files): Add it and tests/signature.h.
diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4
index 829dc610dc..8ba01e5188 100644
--- a/m4/sys_ioctl_h.m4
+++ b/m4/sys_ioctl_h.m4
@@ -1,4 +1,4 @@
-# sys_ioctl_h.m4 serial 5
+# sys_ioctl_h.m4 serial 6
dnl Copyright (C) 2008-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,
@@ -56,6 +56,8 @@ AC_DEFUN([gl_SYS_IOCTL_MODULE_INDICATOR],
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_IOCTL_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_SYS_IOCTL_H_DEFAULTS],
diff --git a/modules/sys_ioctl-tests b/modules/sys_ioctl-tests
index 17363a7131..a647d8f743 100644
--- a/modules/sys_ioctl-tests
+++ b/modules/sys_ioctl-tests
@@ -1,10 +1,19 @@
Files:
tests/test-sys_ioctl.c
+tests/test-sys_ioctl-c++.cc
+tests/signature.h
Depends-on:
+ansi-c++-opt
configure.ac:
Makefile.am:
TESTS += test-sys_ioctl
check_PROGRAMS += test-sys_ioctl
+if ANSICXX
+TESTS += test-sys_ioctl-c++
+check_PROGRAMS += test-sys_ioctl-c++
+test_sys_ioctl_c___SOURCES = test-sys_ioctl-c++.cc
+test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/tests/test-sys_ioctl-c++.cc b/tests/test-sys_ioctl-c++.cc
new file mode 100644
index 0000000000..0be262eb39
--- /dev/null
+++ b/tests/test-sys_ioctl-c++.cc
@@ -0,0 +1,35 @@
+/* Test of <sys/ioctl.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/ioctl.h>
+
+#include "signature.h"
+
+
+#if GNULIB_IOCTL
+SIGNATURE_CHECK (GNULIB_NAMESPACE::ioctl, int, (int, int, ...));
+#endif
+
+
+int
+main ()
+{
+}
--
2.30.2