From 5e065fabdd7d2769a5f70de6b9a9c7510d51d977 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 12 Jul 2011 01:14:47 -0700 Subject: [PATCH] _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. --- ChangeLog | 7 ++++++ modules/_Noreturn-tests | 10 -------- modules/stdnoreturn-tests | 1 - tests/test-_Noreturn.c | 52 --------------------------------------- tests/test-stdnoreturn.c | 49 ++++++++++++++++++++++++++++++++++-- 5 files changed, 54 insertions(+), 65 deletions(-) delete mode 100644 modules/_Noreturn-tests delete mode 100644 tests/test-_Noreturn.c diff --git a/ChangeLog b/ChangeLog index 373c721e1a..6824524675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-07-12 Paul Eggert + _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 index 9afb231e09..0000000000 --- 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 6f66a2c4a9..1d1f820039 100644 --- 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 index c97ef07d45..0000000000 --- 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 . */ - -/* written by Paul Eggert */ - -#include - -#ifdef TEST_STDNORETURN -# include -# 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 a3ddea6a5c..fed5e54b32 100644 --- a/tests/test-stdnoreturn.c +++ b/tests/test-stdnoreturn.c @@ -1,2 +1,47 @@ -#define TEST_STDNORETURN -#include "test-_Noreturn.c" +/* Test of 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 . */ + +/* written by Paul Eggert */ + +#include + +#include + +/* 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; +} -- 2.30.2