_Noreturn-tests: remove module

* modules/_Noreturn-tests: Remove.
* modules/stdnoreturn-tests (Files): Remove tests/test-_Noreturn.c.
* tests/test-_Noreturn.c: Remove.
* tests/test-stdnoreturn.c: Merge from the old
tests/test-_Noreturn.c, testing both noreturn and _Noreturn.

diff --git a/ChangeLog b/ChangeLog
index 373c721e1a02e09636a508ba0b46e91c4eba60fc..6824524675b8a4ffd70c544466c9946f2383578d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+       _Noreturn-tests: remove module
+       * modules/_Noreturn-tests: Remove.
+       * modules/stdnoreturn-tests (Files): Remove tests/test-_Noreturn.c.
+       * tests/test-_Noreturn.c: Remove.
+       * tests/test-stdnoreturn.c: Merge from the old
+       tests/test-_Noreturn.c, testing both noreturn and _Noreturn.
+
        * top/maint.mk: Adjust to new noreturn support.
        (gl_extract_significant_defines_): Omit pattern ATTRIBUTE_NORETURN.
        (def_sym_regex): Do not remove ATTRIBUTE_NORETURN.

diff --git a/modules/_Noreturn-tests b/modules/_Noreturn-tests
deleted file mode 100644 (file)
index 9afb231..0000000
--- a/modules/_Noreturn-tests
+++ /dev/null
@@ -1,10 +0,0 @@
-Files:
-tests/test-_Noreturn.c
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-_Noreturn
-check_PROGRAMS += test-_Noreturn

diff --git a/modules/stdnoreturn-tests b/modules/stdnoreturn-tests
index 6f66a2c4a9f04c97b2252da9ec451f07c1021d92..1d1f8200390115520c3f704120bf1498606dc4d6 100644 (file)
--- a/modules/stdnoreturn-tests
+++ b/modules/stdnoreturn-tests
@@ -1,6 +1,5 @@
 Files:
 tests/test-stdnoreturn.c
-tests/test-_Noreturn.c
 
 Depends-on:
 

diff --git a/tests/test-_Noreturn.c b/tests/test-_Noreturn.c
deleted file mode 100644 (file)
index c97ef07..0000000
--- a/tests/test-_Noreturn.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Test of _Noreturn.
-   Copyright 2011 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 Paul Eggert */
-
-#include <config.h>
-
-#ifdef TEST_STDNORETURN
-# include <stdnoreturn.h>
-# define NORETURN noreturn
-#else
-# define NORETURN _Noreturn
-#endif
-
-/* But did he ever return?  No he never returned,
-   And his fate is still unlearned ... */
-static NORETURN void MTA (void);
-
-static NORETURN void
-Charlie (void)
-{
-  MTA ();
-}
-
-static void
-MTA (void)
-{
-  Charlie ();
-}
-
-int
-main (int argc, char **argv)
-{
-  if (argc <= 0)
-    MTA ();
-  if (!argv[0][0])
-    Charlie ();
-  return 0;
-}

diff --git a/tests/test-stdnoreturn.c b/tests/test-stdnoreturn.c
index a3ddea6a5c048c6743e9e7414d14865ebf57a36e..fed5e54b328c83a504b664f04ae31b8cb36699bb 100644 (file)
--- a/tests/test-stdnoreturn.c
+++ b/tests/test-stdnoreturn.c
@@ -1,2 +1,47 @@
-#define TEST_STDNORETURN
-#include "test-_Noreturn.c"
+/* Test of <stdnoreturn.h> and _Noreturn.
+   Copyright 2011 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 Paul Eggert */
+
+#include <config.h>
+
+#include <stdnoreturn.h>
+
+/* But did he ever return?  No he never returned,
+   And his fate is still unlearned ... */
+static noreturn void MTA (void);
+
+static _Noreturn void
+Charlie (void)
+{
+  MTA ();
+}
+
+static void
+MTA (void)
+{
+  Charlie ();
+}
+
+int
+main (int argc, char **argv)
+{
+  if (argc <= 0)
+    MTA ();
+  if (!argv[0][0])
+    Charlie ();
+  return 0;
+}