summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-03-28 19:07:33 +0200
committerBruno Haible <bruno@clisp.org>2010-03-28 19:07:33 +0200
commit01b63fe905b69ffeb46e6b0e367c7c0256ff8582 (patch)
tree4dd324bd6e629bad974683c27c983bc00b1963e3
parent1d19f103323b9ad6c43a27049f5ce7c4a586d989 (diff)
downloadgnulib-01b63fe905b69ffeb46e6b0e367c7c0256ff8582.tar.gz
Split C++ tests into separate tests modules.
-rw-r--r--ChangeLog70
-rw-r--r--modules/dirent-c++-tests19
-rw-r--r--modules/dirent-tests10
-rw-r--r--modules/fcntl-h-c++-tests19
-rw-r--r--modules/fcntl-h-tests10
-rw-r--r--modules/glob-c++-tests19
-rw-r--r--modules/glob-tests9
-rw-r--r--modules/iconv-h-c++-tests19
-rw-r--r--modules/iconv-h-tests10
-rw-r--r--modules/langinfo-c++-tests18
-rw-r--r--modules/langinfo-tests9
-rw-r--r--modules/locale-c++-tests19
-rw-r--r--modules/locale-tests10
-rw-r--r--modules/math-c++-tests19
-rw-r--r--modules/math-tests10
-rw-r--r--modules/pty-c++-tests19
-rw-r--r--modules/pty-tests10
-rw-r--r--modules/search-c++-tests19
-rw-r--r--modules/search-tests10
-rw-r--r--modules/signal-c++-tests20
-rw-r--r--modules/signal-tests11
-rw-r--r--modules/spawn-c++-tests19
-rw-r--r--modules/spawn-tests10
-rw-r--r--modules/stdio-c++-tests20
-rw-r--r--modules/stdio-tests11
-rw-r--r--modules/stdlib-c++-tests20
-rw-r--r--modules/stdlib-tests11
-rw-r--r--modules/string-c++-tests20
-rw-r--r--modules/string-tests11
-rw-r--r--modules/sys_ioctl-c++-tests19
-rw-r--r--modules/sys_ioctl-tests10
-rw-r--r--modules/sys_select-c++-tests19
-rw-r--r--modules/sys_select-tests10
-rw-r--r--modules/sys_socket-c++-tests19
-rw-r--r--modules/sys_socket-tests10
-rw-r--r--modules/sys_stat-c++-tests19
-rw-r--r--modules/sys_stat-tests10
-rw-r--r--modules/sys_time-c++-tests19
-rw-r--r--modules/sys_time-tests10
-rw-r--r--modules/time-c++-tests20
-rw-r--r--modules/time-tests11
-rw-r--r--modules/unistd-c++-tests19
-rw-r--r--modules/unistd-tests10
-rw-r--r--modules/wchar-c++-tests19
-rw-r--r--modules/wchar-tests10
-rw-r--r--modules/wctype-c++-tests19
-rw-r--r--modules/wctype-tests10
47 files changed, 534 insertions, 210 deletions
diff --git a/ChangeLog b/ChangeLog
index 934f202bd9..9458ed72bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,75 @@
2010-03-28 Bruno Haible <bruno@clisp.org>
+ Split C++ tests into separate tests modules.
+ * modules/dirent-c++-tests: New file, extracted from
+ modules/dirent-tests.
+ * modules/dirent-tests: Depend on it.
+ * modules/fcntl-h-c++-tests: New file, extracted from
+ modules/fcntl-h-tests.
+ * modules/fcntl-h-tests: Depend on it.
+ * modules/glob-c++-tests: New file, extracted from modules/glob-tests.
+ * modules/glob-tests: Depend on it.
+ * modules/iconv-h-c++-tests: New file, extracted from
+ modules/iconv-h-tests.
+ * modules/iconv-h-tests: Depend on it.
+ * modules/langinfo-c++-tests: New file, extracted from
+ modules/langinfo-tests.
+ * modules/langinfo-tests: Depend on it.
+ * modules/locale-c++-tests: New file, extracted from
+ modules/locale-tests.
+ * modules/locale-tests: Depend on it.
+ * modules/math-c++-tests: New file, extracted from modules/math-tests.
+ * modules/math-tests: Depend on it.
+ * modules/pty-c++-tests: New file, extracted from modules/pty-tests.
+ * modules/pty-tests: Depend on it.
+ * modules/search-c++-tests: New file, extracted from
+ modules/search-tests.
+ * modules/search-tests: Depend on it.
+ * modules/signal-c++-tests: New file, extracted from
+ modules/signal-tests.
+ * modules/signal-tests: Depend on it.
+ * modules/spawn-c++-tests: New file, extracted from
+ modules/spawn-tests.
+ * modules/spawn-tests: Depend on it.
+ * modules/stdio-c++-tests: New file, extracted from
+ modules/stdio-tests.
+ * modules/stdio-tests: Depend on it.
+ * modules/stdlib-c++-tests: New file, extracted from
+ modules/stdlib-tests.
+ * modules/stdlib-tests: Depend on it.
+ * modules/string-c++-tests: New file, extracted from
+ modules/string-tests.
+ * modules/string-tests: Depend on it.
+ * modules/sys_ioctl-c++-tests: New file, extracted from
+ modules/sys_ioctl-tests.
+ * modules/sys_ioctl-tests: Depend on it.
+ * modules/sys_select-c++-tests: New file, extracted from
+ modules/sys_select-tests.
+ * modules/sys_select-tests: Depend on it.
+ * modules/sys_socket-c++-tests: New file, extracted from
+ modules/sys_socket-tests.
+ * modules/sys_socket-tests: Depend on it.
+ * modules/sys_stat-c++-tests: New file, extracted from
+ modules/sys_stat-tests.
+ * modules/sys_stat-tests: Depend on it.
+ * modules/sys_time-c++-tests: New file, extracted from
+ modules/sys_time-tests.
+ * modules/sys_time-tests: Depend on it.
+ * modules/time-c++-tests: New file, extracted from modules/time-tests.
+ * modules/time-tests: Depend on it.
+ * modules/unistd-c++-tests: New file, extracted from
+ modules/unistd-tests.
+ * modules/unistd-tests: Depend on it.
+ * modules/wchar-c++-tests: New file, extracted from
+ modules/wchar-tests.
+ * modules/wchar-tests: Depend on it.
+ * modules/wctype-c++-tests: New file, extracted from
+ modules/wctype-tests.
+ * modules/wctype-tests: Depend on it.
+ Reported by Simon Josefsson.
+
+2010-03-28 Bruno Haible <bruno@clisp.org>
+
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
* gnulib-tool (func_exists_module): New function, extracted from
func_verify_module.
diff --git a/modules/dirent-c++-tests b/modules/dirent-c++-tests
new file mode 100644
index 0000000000..8b60ee9395
--- /dev/null
+++ b/modules/dirent-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-dirent-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-dirent-c++
+check_PROGRAMS += test-dirent-c++
+test_dirent_c___SOURCES = test-dirent-c++.cc
+test_dirent_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/dirent-tests b/modules/dirent-tests
index 1058c4ed0f..9e6f9a4d0f 100644
--- a/modules/dirent-tests
+++ b/modules/dirent-tests
@@ -1,19 +1,11 @@
Files:
tests/test-dirent.c
-tests/test-dirent-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+dirent-c++-tests
configure.ac:
Makefile.am:
TESTS += test-dirent
check_PROGRAMS += test-dirent
-if ANSICXX
-TESTS += test-dirent-c++
-check_PROGRAMS += test-dirent-c++
-test_dirent_c___SOURCES = test-dirent-c++.cc
-test_dirent_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/fcntl-h-c++-tests b/modules/fcntl-h-c++-tests
new file mode 100644
index 0000000000..c71d15a0bb
--- /dev/null
+++ b/modules/fcntl-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-fcntl-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-fcntl-h-c++
+check_PROGRAMS += test-fcntl-h-c++
+test_fcntl_h_c___SOURCES = test-fcntl-h-c++.cc
+test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/modules/fcntl-h-tests b/modules/fcntl-h-tests
index e06b5bdd0c..5238922777 100644
--- a/modules/fcntl-h-tests
+++ b/modules/fcntl-h-tests
@@ -1,19 +1,11 @@
Files:
tests/test-fcntl-h.c
-tests/test-fcntl-h-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+fcntl-h-c++-tests
configure.ac:
Makefile.am:
TESTS += test-fcntl-h
check_PROGRAMS += test-fcntl-h
-if ANSICXX
-TESTS += test-fcntl-h-c++
-check_PROGRAMS += test-fcntl-h-c++
-test_fcntl_h_c___SOURCES = test-fcntl-h-c++.cc
-test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
diff --git a/modules/glob-c++-tests b/modules/glob-c++-tests
new file mode 100644
index 0000000000..daa3ec71ac
--- /dev/null
+++ b/modules/glob-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-glob-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-glob-c++
+check_PROGRAMS += test-glob-c++
+test_glob_c___SOURCES = test-glob-c++.cc
+test_glob_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/modules/glob-tests b/modules/glob-tests
index 68d95af412..151bc06b32 100644
--- a/modules/glob-tests
+++ b/modules/glob-tests
@@ -1,20 +1,13 @@
Files:
tests/test-glob.c
-tests/test-glob-c++.cc
tests/signature.h
tests/macros.h
Depends-on:
-ansi-c++-opt
+glob-c++-tests
configure.ac:
Makefile.am:
TESTS += test-glob
check_PROGRAMS += test-glob
-if ANSICXX
-TESTS += test-glob-c++
-check_PROGRAMS += test-glob-c++
-test_glob_c___SOURCES = test-glob-c++.cc
-test_glob_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
diff --git a/modules/iconv-h-c++-tests b/modules/iconv-h-c++-tests
new file mode 100644
index 0000000000..cc41b11fc4
--- /dev/null
+++ b/modules/iconv-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-iconv-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-iconv-h-c++
+check_PROGRAMS += test-iconv-h-c++
+test_iconv_h_c___SOURCES = test-iconv-h-c++.cc
+test_iconv_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBICONV) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/iconv-h-tests b/modules/iconv-h-tests
index 8f23ad1f30..de2401f722 100644
--- a/modules/iconv-h-tests
+++ b/modules/iconv-h-tests
@@ -1,19 +1,11 @@
Files:
tests/test-iconv-h.c
-tests/test-iconv-h-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+iconv-h-c++-tests
configure.ac:
Makefile.am:
TESTS += test-iconv-h
check_PROGRAMS += test-iconv-h
-if ANSICXX
-TESTS += test-iconv-h-c++
-check_PROGRAMS += test-iconv-h-c++
-test_iconv_h_c___SOURCES = test-iconv-h-c++.cc
-test_iconv_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBICONV) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/langinfo-c++-tests b/modules/langinfo-c++-tests
new file mode 100644
index 0000000000..653637f05b
--- /dev/null
+++ b/modules/langinfo-c++-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-langinfo-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-langinfo-c++
+check_PROGRAMS += test-langinfo-c++
+test_langinfo_c___SOURCES = test-langinfo-c++.cc
+endif
diff --git a/modules/langinfo-tests b/modules/langinfo-tests
index 54270bd9d6..ef94dfc05f 100644
--- a/modules/langinfo-tests
+++ b/modules/langinfo-tests
@@ -1,18 +1,11 @@
Files:
tests/test-langinfo.c
-tests/test-langinfo-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+langinfo-c++-tests
configure.ac:
Makefile.am:
TESTS += test-langinfo
check_PROGRAMS += test-langinfo
-if ANSICXX
-TESTS += test-langinfo-c++
-check_PROGRAMS += test-langinfo-c++
-test_langinfo_c___SOURCES = test-langinfo-c++.cc
-endif
diff --git a/modules/locale-c++-tests b/modules/locale-c++-tests
new file mode 100644
index 0000000000..684402d60c
--- /dev/null
+++ b/modules/locale-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-locale-c++.cc
+tests/test-locale-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-locale-c++
+check_PROGRAMS += test-locale-c++
+test_locale_c___SOURCES = test-locale-c++.cc test-locale-c++2.cc
+endif
diff --git a/modules/locale-tests b/modules/locale-tests
index 5fad3fb20c..2e661f7565 100644
--- a/modules/locale-tests
+++ b/modules/locale-tests
@@ -1,12 +1,9 @@
Files:
tests/test-locale.c
-tests/test-locale-c++.cc
-tests/test-locale-c++2.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+locale-c++-tests
configure.ac:
AC_CHECK_FUNCS_ONCE([newlocale])
@@ -14,8 +11,3 @@ AC_CHECK_FUNCS_ONCE([newlocale])
Makefile.am:
TESTS += test-locale
check_PROGRAMS += test-locale
-if ANSICXX
-TESTS += test-locale-c++
-check_PROGRAMS += test-locale-c++
-test_locale_c___SOURCES = test-locale-c++.cc test-locale-c++2.cc
-endif
diff --git a/modules/math-c++-tests b/modules/math-c++-tests
new file mode 100644
index 0000000000..24aa81078e
--- /dev/null
+++ b/modules/math-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-math-c++.cc
+tests/test-math-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-math-c++
+check_PROGRAMS += test-math-c++
+test_math_c___SOURCES = test-math-c++.cc test-math-c++2.cc
+endif
diff --git a/modules/math-tests b/modules/math-tests
index 5d89f28dfb..84c91413e6 100644
--- a/modules/math-tests
+++ b/modules/math-tests
@@ -1,19 +1,11 @@
Files:
tests/test-math.c
-tests/test-math-c++.cc
-tests/test-math-c++2.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+math-c++-tests
configure.ac:
Makefile.am:
TESTS += test-math
check_PROGRAMS += test-math
-if ANSICXX
-TESTS += test-math-c++
-check_PROGRAMS += test-math-c++
-test_math_c___SOURCES = test-math-c++.cc test-math-c++2.cc
-endif
diff --git a/modules/pty-c++-tests b/modules/pty-c++-tests
new file mode 100644
index 0000000000..381a9ca049
--- /dev/null
+++ b/modules/pty-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-pty-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-pty-c++
+check_PROGRAMS += test-pty-c++
+test_pty_c___SOURCES = test-pty-c++.cc
+test_pty_c___LDADD = $(LDADD) $(PTY_LIB)
+endif
diff --git a/modules/pty-tests b/modules/pty-tests
index 0d40dabdf0..7a6bce9784 100644
--- a/modules/pty-tests
+++ b/modules/pty-tests
@@ -1,16 +1,8 @@
Files:
-tests/test-pty-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+pty-c++-tests
configure.ac:
Makefile.am:
-if ANSICXX
-TESTS += test-pty-c++
-check_PROGRAMS += test-pty-c++
-test_pty_c___SOURCES = test-pty-c++.cc
-test_pty_c___LDADD = $(LDADD) $(PTY_LIB)
-endif
diff --git a/modules/search-c++-tests b/modules/search-c++-tests
new file mode 100644
index 0000000000..f051eaf715
--- /dev/null
+++ b/modules/search-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-search-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-search-c++
+check_PROGRAMS += test-search-c++
+test_search_c___SOURCES = test-search-c++.cc
+test_search_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/search-tests b/modules/search-tests
index 09445ab7d5..922783aff7 100644
--- a/modules/search-tests
+++ b/modules/search-tests
@@ -1,19 +1,11 @@
Files:
tests/test-search.c
-tests/test-search-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+search-c++-tests
configure.ac:
Makefile.am:
TESTS += test-search
check_PROGRAMS += test-search
-if ANSICXX
-TESTS += test-search-c++
-check_PROGRAMS += test-search-c++
-test_search_c___SOURCES = test-search-c++.cc
-test_search_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/signal-c++-tests b/modules/signal-c++-tests
new file mode 100644
index 0000000000..a51e84f283
--- /dev/null
+++ b/modules/signal-c++-tests
@@ -0,0 +1,20 @@
+Files:
+tests/test-signal-c++.cc
+tests/test-signal-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-signal-c++
+check_PROGRAMS += test-signal-c++
+test_signal_c___SOURCES = test-signal-c++.cc test-signal-c++2.cc
+test_signal_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/signal-tests b/modules/signal-tests
index 7c3e150831..9b882a5349 100644
--- a/modules/signal-tests
+++ b/modules/signal-tests
@@ -1,20 +1,11 @@
Files:
tests/test-signal.c
-tests/test-signal-c++.cc
-tests/test-signal-c++2.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+signal-c++-tests
configure.ac:
Makefile.am:
TESTS += test-signal
check_PROGRAMS += test-signal
-if ANSICXX
-TESTS += test-signal-c++
-check_PROGRAMS += test-signal-c++
-test_signal_c___SOURCES = test-signal-c++.cc test-signal-c++2.cc
-test_signal_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/spawn-c++-tests b/modules/spawn-c++-tests
new file mode 100644
index 0000000000..e685cacf6b
--- /dev/null
+++ b/modules/spawn-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-spawn-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-spawn-c++
+check_PROGRAMS += test-spawn-c++
+test_spawn_c___SOURCES = test-spawn-c++.cc
+test_spawn_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/spawn-tests b/modules/spawn-tests
index 18dfae2f7b..056b2d87ef 100644
--- a/modules/spawn-tests
+++ b/modules/spawn-tests
@@ -1,19 +1,11 @@
Files:
tests/test-spawn.c
-tests/test-spawn-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+spawn-c++-tests
configure.ac:
Makefile.am:
TESTS += test-spawn
check_PROGRAMS += test-spawn
-if ANSICXX
-TESTS += test-spawn-c++
-check_PROGRAMS += test-spawn-c++
-test_spawn_c___SOURCES = test-spawn-c++.cc
-test_spawn_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/stdio-c++-tests b/modules/stdio-c++-tests
new file mode 100644
index 0000000000..b73ee2689e
--- /dev/null
+++ b/modules/stdio-c++-tests
@@ -0,0 +1,20 @@
+Files:
+tests/test-stdio-c++.cc
+tests/test-stdio-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-stdio-c++
+check_PROGRAMS += test-stdio-c++
+test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc
+test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/stdio-tests b/modules/stdio-tests
index 6330181869..533d6f2395 100644
--- a/modules/stdio-tests
+++ b/modules/stdio-tests
@@ -1,21 +1,12 @@
Files:
tests/test-stdio.c
-tests/test-stdio-c++.cc
-tests/test-stdio-c++2.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+stdio-c++-tests
configure.ac:
Makefile.am:
TESTS += test-stdio
check_PROGRAMS += test-stdio
-if ANSICXX
-TESTS += test-stdio-c++
-check_PROGRAMS += test-stdio-c++
-test_stdio_c___SOURCES = test-stdio-c++.cc test-stdio-c++2.cc
-test_stdio_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/stdlib-c++-tests b/modules/stdlib-c++-tests
new file mode 100644
index 0000000000..93a224de04
--- /dev/null
+++ b/modules/stdlib-c++-tests
@@ -0,0 +1,20 @@
+Files:
+tests/test-stdlib-c++.cc
+tests/test-stdlib-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-stdlib-c++
+check_PROGRAMS += test-stdlib-c++
+test_stdlib_c___SOURCES = test-stdlib-c++.cc test-stdlib-c++2.cc
+test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/modules/stdlib-tests b/modules/stdlib-tests
index 2673470bf9..4f9368a3c3 100644
--- a/modules/stdlib-tests
+++ b/modules/stdlib-tests
@@ -1,21 +1,12 @@
Files:
tests/test-stdlib.c
-tests/test-stdlib-c++.cc
-tests/test-stdlib-c++2.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+stdlib-c++-tests
configure.ac:
Makefile.am:
TESTS += test-stdlib
check_PROGRAMS += test-stdlib
-if ANSICXX
-TESTS += test-stdlib-c++
-check_PROGRAMS += test-stdlib-c++
-test_stdlib_c___SOURCES = test-stdlib-c++.cc test-stdlib-c++2.cc
-test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
diff --git a/modules/string-c++-tests b/modules/string-c++-tests
new file mode 100644
index 0000000000..2f7e23ca9d
--- /dev/null
+++ b/modules/string-c++-tests
@@ -0,0 +1,20 @@
+Files:
+tests/test-string-c++.cc
+tests/test-string-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-string-c++
+check_PROGRAMS += test-string-c++
+test_string_c___SOURCES = test-string-c++.cc test-string-c++2.cc
+test_string_c___LDADD = $(LDADD) $(LIBINTL)
+endif
diff --git a/modules/string-tests b/modules/string-tests
index 1c9a1e1cc7..ec732da6a3 100644
--- a/modules/string-tests
+++ b/modules/string-tests
@@ -1,21 +1,12 @@
Files:
tests/test-string.c
-tests/test-string-c++.cc
-tests/test-string-c++2.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+string-c++-tests
configure.ac:
Makefile.am:
TESTS += test-string
check_PROGRAMS += test-string
-if ANSICXX
-TESTS += test-string-c++
-check_PROGRAMS += test-string-c++
-test_string_c___SOURCES = test-string-c++.cc test-string-c++2.cc
-test_string_c___LDADD = $(LDADD) $(LIBINTL)
-endif
diff --git a/modules/sys_ioctl-c++-tests b/modules/sys_ioctl-c++-tests
new file mode 100644
index 0000000000..171d017525
--- /dev/null
+++ b/modules/sys_ioctl-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_ioctl-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+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) $(LIBSOCKET) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/modules/sys_ioctl-tests b/modules/sys_ioctl-tests
index d700d3434d..8e85e638a7 100644
--- a/modules/sys_ioctl-tests
+++ b/modules/sys_ioctl-tests
@@ -1,19 +1,11 @@
Files:
tests/test-sys_ioctl.c
-tests/test-sys_ioctl-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+sys_ioctl-c++-tests
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) $(LIBSOCKET) $(LIB_CLOCK_GETTIME)
-endif
diff --git a/modules/sys_select-c++-tests b/modules/sys_select-c++-tests
new file mode 100644
index 0000000000..cd9c85ef3e
--- /dev/null
+++ b/modules/sys_select-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_select-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_select-c++
+check_PROGRAMS += test-sys_select-c++
+test_sys_select_c___SOURCES = test-sys_select-c++.cc
+test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/sys_select-tests b/modules/sys_select-tests
index 1ba7a4af3b..3d92499e6b 100644
--- a/modules/sys_select-tests
+++ b/modules/sys_select-tests
@@ -1,19 +1,11 @@
Files:
tests/test-sys_select.c
-tests/test-sys_select-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+sys_select-c++-tests
configure.ac:
Makefile.am:
TESTS += test-sys_select
check_PROGRAMS += test-sys_select
-if ANSICXX
-TESTS += test-sys_select-c++
-check_PROGRAMS += test-sys_select-c++
-test_sys_select_c___SOURCES = test-sys_select-c++.cc
-test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/sys_socket-c++-tests b/modules/sys_socket-c++-tests
new file mode 100644
index 0000000000..d2ecd2e8cb
--- /dev/null
+++ b/modules/sys_socket-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_socket-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_socket-c++
+check_PROGRAMS += test-sys_socket-c++
+test_sys_socket_c___SOURCES = test-sys_socket-c++.cc
+test_sys_socket_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/sys_socket-tests b/modules/sys_socket-tests
index 14af735c37..da67baf99a 100644
--- a/modules/sys_socket-tests
+++ b/modules/sys_socket-tests
@@ -1,10 +1,8 @@
Files:
tests/test-sys_socket.c
-tests/test-sys_socket-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+sys_socket-c++-tests
configure.ac:
AC_CHECK_FUNCS_ONCE([shutdown])
@@ -12,9 +10,3 @@ AC_CHECK_FUNCS_ONCE([shutdown])
Makefile.am:
TESTS += test-sys_socket
check_PROGRAMS += test-sys_socket
-if ANSICXX
-TESTS += test-sys_socket-c++
-check_PROGRAMS += test-sys_socket-c++
-test_sys_socket_c___SOURCES = test-sys_socket-c++.cc
-test_sys_socket_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/sys_stat-c++-tests b/modules/sys_stat-c++-tests
new file mode 100644
index 0000000000..03f0048f87
--- /dev/null
+++ b/modules/sys_stat-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_stat-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_stat-c++
+check_PROGRAMS += test-sys_stat-c++
+test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
+test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/modules/sys_stat-tests b/modules/sys_stat-tests
index 08e93cb3dc..a5ede77aba 100644
--- a/modules/sys_stat-tests
+++ b/modules/sys_stat-tests
@@ -1,20 +1,12 @@
Files:
tests/test-sys_stat.c
-tests/test-sys_stat-c++.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+sys_stat-c++-tests
configure.ac:
Makefile.am:
TESTS += test-sys_stat
check_PROGRAMS += test-sys_stat
-if ANSICXX
-TESTS += test-sys_stat-c++
-check_PROGRAMS += test-sys_stat-c++
-test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
-test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
diff --git a/modules/sys_time-c++-tests b/modules/sys_time-c++-tests
new file mode 100644
index 0000000000..90803efd08
--- /dev/null
+++ b/modules/sys_time-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-sys_time-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+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) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/sys_time-tests b/modules/sys_time-tests
index 67e8fa6561..7834c6fefd 100644
--- a/modules/sys_time-tests
+++ b/modules/sys_time-tests
@@ -1,19 +1,11 @@
Files:
tests/test-sys_time.c
-tests/test-sys_time-c++.cc
-tests/signature.h
Depends-on:
-ansi-c++-opt
+sys_time-c++-tests
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) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/time-c++-tests b/modules/time-c++-tests
new file mode 100644
index 0000000000..c811d6fd42
--- /dev/null
+++ b/modules/time-c++-tests
@@ -0,0 +1,20 @@
+Files:
+tests/test-time-c++.cc
+tests/test-time-c++2.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-time-c++
+check_PROGRAMS += test-time-c++
+test_time_c___SOURCES = test-time-c++.cc test-time-c++2.cc
+test_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/time-tests b/modules/time-tests
index 4555357dbc..de7e2383c8 100644
--- a/modules/time-tests
+++ b/modules/time-tests
@@ -1,21 +1,12 @@
Files:
tests/test-time.c
-tests/test-time-c++.cc
-tests/test-time-c++2.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+time-c++-tests
configure.ac:
Makefile.am:
TESTS += test-time
check_PROGRAMS += test-time
-if ANSICXX
-TESTS += test-time-c++
-check_PROGRAMS += test-time-c++
-test_time_c___SOURCES = test-time-c++.cc test-time-c++2.cc
-test_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests
new file mode 100644
index 0000000000..7c97ce0df2
--- /dev/null
+++ b/modules/unistd-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-unistd-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-unistd-c++
+check_PROGRAMS += test-unistd-c++
+test_unistd_c___SOURCES = test-unistd-c++.cc
+test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+endif
diff --git a/modules/unistd-tests b/modules/unistd-tests
index 6034fd5591..9b8222c604 100644
--- a/modules/unistd-tests
+++ b/modules/unistd-tests
@@ -1,20 +1,12 @@
Files:
tests/test-unistd.c
-tests/test-unistd-c++.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+unistd-c++-tests
configure.ac:
Makefile.am:
TESTS += test-unistd
check_PROGRAMS += test-unistd
-if ANSICXX
-TESTS += test-unistd-c++
-check_PROGRAMS += test-unistd-c++
-test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
diff --git a/modules/wchar-c++-tests b/modules/wchar-c++-tests
new file mode 100644
index 0000000000..3f72031820
--- /dev/null
+++ b/modules/wchar-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-wchar-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-wchar-c++
+check_PROGRAMS += test-wchar-c++
+test_wchar_c___SOURCES = test-wchar-c++.cc
+test_wchar_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/wchar-tests b/modules/wchar-tests
index 63d6c1ec22..afe3bff752 100644
--- a/modules/wchar-tests
+++ b/modules/wchar-tests
@@ -1,20 +1,12 @@
Files:
tests/test-wchar.c
-tests/test-wchar-c++.cc
-tests/signature.h
Depends-on:
verify
-ansi-c++-opt
+wchar-c++-tests
configure.ac:
Makefile.am:
TESTS += test-wchar
check_PROGRAMS += test-wchar
-if ANSICXX
-TESTS += test-wchar-c++
-check_PROGRAMS += test-wchar-c++
-test_wchar_c___SOURCES = test-wchar-c++.cc
-test_wchar_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
diff --git a/modules/wctype-c++-tests b/modules/wctype-c++-tests
new file mode 100644
index 0000000000..21da997345
--- /dev/null
+++ b/modules/wctype-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-wctype-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-wctype-c++
+check_PROGRAMS += test-wctype-c++
+test_wctype_c___SOURCES = test-wctype-c++.cc
+test_wctype_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+endif
diff --git a/modules/wctype-tests b/modules/wctype-tests
index d9d282d731..41b1b0d9ae 100644
--- a/modules/wctype-tests
+++ b/modules/wctype-tests
@@ -1,20 +1,12 @@
Files:
tests/test-wctype.c
-tests/test-wctype-c++.cc
-tests/signature.h
tests/macros.h
Depends-on:
-ansi-c++-opt
+wctype-c++-tests
configure.ac:
Makefile.am:
TESTS += test-wctype
check_PROGRAMS += test-wctype
-if ANSICXX
-TESTS += test-wctype-c++
-check_PROGRAMS += test-wctype-c++
-test_wctype_c___SOURCES = test-wctype-c++.cc
-test_wctype_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif