From e531bc192db48a5ff92ed6cc7cab9c502f52a158 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 16 Aug 2024 17:58:19 +0200 Subject: [PATCH] gnulib-tool-tests: Update expected test results after gnulib-tool.py changed. --- .../create-tests/test-create-testdir-4.out | 2 + .../test-create-testdir-4.result/configure.ac | 1 + .../glm4/Makefile.am | 1 + .../glm4/valgrind-tests.m4 | 103 ++++++ .../import-tests/test-oath-toolkit-2.out | 14 +- .../liboath/gl/m4/gnulib-comp.m4 | 10 - .../liboath/gl/tests/Makefile.am | 165 --------- .../liboath/gl/tests/_Noreturn.h | 50 --- .../liboath/gl/tests/arg-nonnull.h | 26 -- .../liboath/gl/tests/c++defs.h | 337 ------------------ .../liboath/gl/tests/dummy.c | 31 -- .../liboath/gl/tests/warn-on-use.h | 149 -------- .../import-tests/test-oath-toolkit-4.out | 14 +- .../libpskc/gl/m4/gnulib-comp.m4 | 10 - .../libpskc/gl/tests/Makefile.am | 165 --------- .../libpskc/gl/tests/_Noreturn.h | 50 --- .../libpskc/gl/tests/arg-nonnull.h | 26 -- .../libpskc/gl/tests/c++defs.h | 337 ------------------ .../libpskc/gl/tests/dummy.c | 31 -- .../libpskc/gl/tests/warn-on-use.h | 149 -------- gnulib-tool-tests/info-tests/test-list.output | 1 + 21 files changed, 110 insertions(+), 1562 deletions(-) create mode 100644 gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/valgrind-tests.m4 delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/Makefile.am delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/_Noreturn.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/arg-nonnull.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/c++defs.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/dummy.c delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/warn-on-use.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/Makefile.am delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/_Noreturn.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/arg-nonnull.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/c++defs.h delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/dummy.c delete mode 100644 gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/warn-on-use.h diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-4.out b/gnulib-tool-tests/create-tests/test-create-testdir-4.out index adb002b0..3487ce02 100644 --- a/gnulib-tool-tests/create-tests/test-create-testdir-4.out +++ b/gnulib-tool-tests/create-tests/test-create-testdir-4.out @@ -2957,6 +2957,7 @@ Module list with included dependencies (indented): utmp-c++-tests utmp-tests va-args + valgrind-tests vararrays vasnprintf vasnprintf-gnu @@ -6471,6 +6472,7 @@ File list: m4/utmp_h.m4 m4/va-args.m4 m4/valgrind-helper.m4 + m4/valgrind-tests.m4 m4/vararrays.m4 m4/vasnprintf-gnu.m4 m4/vasnprintf-posix.m4 diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-4.result/configure.ac b/gnulib-tool-tests/create-tests/test-create-testdir-4.result/configure.ac index 9f459f03..7eeb5e31 100644 --- a/gnulib-tool-tests/create-tests/test-create-testdir-4.result/configure.ac +++ b/gnulib-tool-tests/create-tests/test-create-testdir-4.result/configure.ac @@ -4084,6 +4084,7 @@ AM_GNU_GETTEXT_VERSION([0.22]) gl_UTMP_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P gl_VA_ARGS + gl_VALGRIND_TESTS AC_C_VARARRAYS AC_REQUIRE([AC_C_RESTRICT]) gl_FUNC_VASNPRINTF diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/Makefile.am b/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/Makefile.am index ca989e65..2c9cdb84 100644 --- a/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/Makefile.am +++ b/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/Makefile.am @@ -788,6 +788,7 @@ EXTRA_DIST += utimes.m4 EXTRA_DIST += utmp_h.m4 EXTRA_DIST += va-args.m4 EXTRA_DIST += valgrind-helper.m4 +EXTRA_DIST += valgrind-tests.m4 EXTRA_DIST += vararrays.m4 EXTRA_DIST += vasnprintf-gnu.m4 EXTRA_DIST += vasnprintf-posix.m4 diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/valgrind-tests.m4 b/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/valgrind-tests.m4 new file mode 100644 index 00000000..d3ec1281 --- /dev/null +++ b/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4/valgrind-tests.m4 @@ -0,0 +1,103 @@ +# valgrind-tests.m4 serial 9 +dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Simon Josefsson + +# gl_VALGRIND_TESTS() +# ------------------- +# Check if valgrind is available. + +# Sets VALGRIND to command line (including options) to invoke valgrind +# with, may be used directly in autoconf, makefiles or shell scripts. + +# Sets LOG_VALGRIND, suitable for use with LOG_COMPILER, that in +# Makefile will expand to command line to invoke self-tests with, +# i.e., LOG_VALGRIND = $(VALGRIND) $(DEFAULT_VALGRINDFLAGS) +# $(VALGRINDFLAGS) $(AM_VALGRINDFLAGS). + +# Whether to look for valgrind and set the variables can be influenced +# by calling gl_VALGRIND_TESTS_DEFAULT_NO in configure.ac. +# Regardless, the user can change the choice through the options +# --enable-valgrind-tests or --disable-valgrind-tests. + +# You may modify the VALGRIND, DEFAULT_VALGRINDFLAGS and VALGRINDFLAGS +# variables before calling this function to override defaults. Either +# as developer from configure.ac or user on the ./configure command +# line. You may set the AM_VALGRINDFLAGS in Makefile.am to provide a +# per-directory additional flag. + +AC_DEFUN([gl_VALGRIND_TESTS_DEFAULT_NO], +[ + gl_valgrind_tests_default=no +]) + +AC_DEFUN_ONCE([gl_VALGRIND_TESTS], +[ + AC_ARG_ENABLE([valgrind-tests], + AS_HELP_STRING([[--disable-valgrind-tests]], + [don't try to run self tests under valgrind]), + [opt_valgrind_tests=$enableval], [opt_valgrind_tests=${gl_valgrind_tests_default:-yes}]) + + # Run self-tests under valgrind? + if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then + AC_CHECK_PROGS([VALGRIND], [valgrind]) + + # VALGRIND_PROGRAM contains the tool found by AC_CHECK_PROGS. For + # backwards compatibility, the VALGRIND variable is later modified + # to also include all enabled options. However the new variable + # LOG_VALGRIND needs to be able to refer to the valgrind tool + # without options, hence it uses this variable. + AC_SUBST([VALGRIND_PROGRAM], [$VALGRIND]) + + AC_SUBST([DEFAULT_VALGRINDFLAGS]) + if test -z "$DEFAULT_VALGRINDFLAGS"; then + DEFAULT_VALGRINDFLAGS="-q --error-exitcode=1 --leak-check=full" + fi + AC_ARG_VAR([VALGRINDFLAGS], [Additional flags for Valgrind]) + + if test -n "$VALGRIND"; then + AC_CACHE_CHECK([for valgrind options for tests], + [gl_cv_opt_valgrind_tests], + [AS_IF([$VALGRIND $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS true], + [gl_cv_opt_valgrind_tests="$DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS"], + [gl_cv_opt_valgrind_tests=no]) + ]) + if test "$gl_cv_opt_valgrind_tests" != no; then + VALGRIND="$VALGRIND $gl_cv_opt_valgrind_tests" + fi + fi + + if test -n "$VALGRIND"; then + dnl On Ubuntu 16.04, /usr/bin/valgrind works only on 64-bit executables + dnl but fails on 32-bit executables (with exit code 1) and on x86_64-x32 + dnl executables (with exit code 126). + AC_CACHE_CHECK([whether valgrind works on executables produced by the compiler], + [gl_cv_prog_valgrind_works], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[int main () { return 0; }]])], + [$VALGRIND $gl_cv_opt_valgrind_tests ./conftest$ac_exeext 2>/dev/null + if test $? = 0; then + gl_cv_prog_valgrind_works=yes + else + gl_cv_prog_valgrind_works=no + fi + ], + [gl_cv_prog_valgrind_works=no]) + ]) + fi + + AC_SUBST([AM_VALGRINDFLAGS]) + AC_SUBST([LOG_VALGRIND], ["\$(VALGRIND_PROGRAM) \$(DEFAULT_VALGRINDFLAGS) \$(VALGRINDFLAGS) \$(AM_VALGRINDFLAGS)"]) + + if test "$gl_cv_prog_valgrind_works" != yes; then + DEFAULT_VALGRINDFLAGS= + LOG_VALGRIND= + VALGRIND= + VALGRINDFLAGS= + VALGRIND_PROGRAM= + fi + fi +]) diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.out b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.out index a4806539..7ff32305 100644 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.out +++ b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.out @@ -439,12 +439,6 @@ File list: m4/wint_t.m4 m4/xsize.m4 m4/zzgnulib.m4 - lib/_Noreturn.h -> tests/_Noreturn.h - lib/arg-nonnull.h -> tests/arg-nonnull.h - lib/c++defs.h -> tests/c++defs.h - lib/dummy.c -> tests/dummy.c - lib/warn-on-use.h -> tests/warn-on-use.h -Creating directory ./gl/tests Updating file gl/cdefs.h (backup in gl/cdefs.h~) Updating file gl/filename.h (backup in gl/filename.h~) Updating file gl/limits.in.h (backup in gl/limits.in.h~) @@ -458,15 +452,10 @@ Updating file gl/malloc/scratch_buffer_grow_preserve.c (backup in gl/malloc/scra Updating file gl/malloc/scratch_buffer_set_array_size.c (backup in gl/malloc/scratch_buffer_set_array_size.c~) Updating file gl/stdlib.in.h (backup in gl/stdlib.in.h~) Updating file gl/string.in.h (backup in gl/string.in.h~) -Copying file gl/tests/_Noreturn.h -Copying file gl/tests/arg-nonnull.h -Copying file gl/tests/c++defs.h -Copying file gl/tests/dummy.c -Copying file gl/tests/warn-on-use.h Updating file gl/time.in.h (backup in gl/time.in.h~) Updating gl/m4/gnulib-cache.m4 (backup in gl/m4/gnulib-cache.m4~) +Updating gl/m4/gnulib-comp.m4 (backup in gl/m4/gnulib-comp.m4~) Updating gl/Makefile.am (backup in gl/Makefile.am~) -Creating gl/tests/Makefile.am Finished. You may need to add #include directives for the following .h files. @@ -486,7 +475,6 @@ in _a_LDFLAGS or _la_LDFLAGS when linking a library. Don't forget to - add "gl/Makefile" to AC_CONFIG_FILES in ./configure.ac, - - add "gl/tests/Makefile" to AC_CONFIG_FILES in ./configure.ac, - mention "gl" in SUBDIRS in Makefile.am, - mention "-I gl/m4" in ACLOCAL_AMFLAGS in Makefile.am or add an AC_CONFIG_MACRO_DIRS([gl/m4]) invocation in ./configure.ac, diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/m4/gnulib-comp.m4 b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/m4/gnulib-comp.m4 index d9cc7c19..85fd9c16 100644 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/m4/gnulib-comp.m4 +++ b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/m4/gnulib-comp.m4 @@ -669,8 +669,6 @@ changequote([, ])dnl m4_pushdef([GL_MACRO_PREFIX], [gltests]) m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) gl_COMMON - AC_REQUIRE([gl_CC_ALLOW_WARNINGS]) - AC_REQUIRE([gl_CXX_ALLOW_WARNINGS]) gl_source_base='gl/tests' gl_source_base_prefix= changequote(,)dnl @@ -679,7 +677,6 @@ changequote([, ])dnl AC_SUBST([gltests_WITNESS]) gl_module_indicator_condition=$gltests_WITNESS m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) - gl_VALGRIND_TESTS m4_popdef([gl_MODULE_INDICATOR_CONDITION]) m4_ifval(gltests_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || @@ -726,8 +723,6 @@ changequote([, ])dnl AC_SUBST([gltests_LIBOBJDEPS], [$gltests_libobjdeps]) ]) AC_REQUIRE([gl_CC_GNULIB_WARNINGS]) - LIBTESTS_LIBDEPS="$gltests_libdeps" - AC_SUBST([LIBTESTS_LIBDEPS]) ]) # Like AC_LIBOBJ, except that the module name goes @@ -1087,9 +1082,4 @@ AC_DEFUN([gl_FILE_LIST], [ m4/wint_t.m4 m4/xsize.m4 m4/zzgnulib.m4 - tests=lib/_Noreturn.h - tests=lib/arg-nonnull.h - tests=lib/c++defs.h - tests=lib/dummy.c - tests=lib/warn-on-use.h ]) diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/Makefile.am b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/Makefile.am deleted file mode 100644 index 49090f67..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/Makefile.am +++ /dev/null @@ -1,165 +0,0 @@ -## DO NOT EDIT! GENERATED AUTOMATICALLY! -## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2024 Free Software Foundation, Inc. -# -# This file 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 file 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 file. If not, see . -# -# As a special exception to the GNU General Public License, -# this file may be distributed as part of a program that -# contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. - -AUTOMAKE_OPTIONS = 1.14 foreign - -SUBDIRS = . -TESTS = -XFAIL_TESTS = -TESTS_ENVIRONMENT = -noinst_PROGRAMS = -check_PROGRAMS = -EXTRA_PROGRAMS = -noinst_HEADERS = -noinst_LIBRARIES = -check_LIBRARIES = libtests.a -pkgdata_DATA = -EXTRA_DIST = -BUILT_SOURCES = -SUFFIXES = -MOSTLYCLEANFILES = core *.stackdump -MOSTLYCLEANDIRS = -CLEANFILES = -DISTCLEANFILES = -MAINTAINERCLEANFILES = - -CFLAGS = @GL_CFLAG_ALLOW_WARNINGS@ $(GL_CFLAG_GNULIB_WARNINGS) @CFLAGS@ -CXXFLAGS = @GL_CXXFLAG_ALLOW_WARNINGS@ @CXXFLAGS@ - -AM_CPPFLAGS = \ - -D@gltests_WITNESS@=1 \ - -I. -I$(srcdir) \ - -I../.. -I$(srcdir)/../.. \ - -I../../gl -I$(srcdir)/../../gl - -LDADD = libtests.a ../../gl/libgnu.la libtests.a ../../gl/libgnu.la libtests.a $(LIBTESTS_LIBDEPS) - -libtests_a_SOURCES = -libtests_a_LIBADD = $(gltests_LIBOBJS) -libtests_a_DEPENDENCIES = $(gltests_LIBOBJS) -EXTRA_libtests_a_SOURCES = -AM_LIBTOOLFLAGS = --preserve-dup-deps - -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' -IGNORE_SKIPPED_LOGS = 1 - -## begin gnulib module gen-header - -# In 'sed', replace the pattern space with a "DO NOT EDIT" comment. -SED_HEADER_NOEDIT = s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */, - -# '$(SED_HEADER_STDOUT) -e "..."' runs 'sed' but first outputs "DO NOT EDIT". -SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G - -# '$(SED_HEADER_TO_AT_t) FILE' copies FILE to $@-t, prepending a leading -# "DO_NOT_EDIT". Although this could be done more simply via: -# SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) > $@-t -# the -n and 'w' avoid a fork+exec, at least when GNU Make is used. -SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' - -# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that -# is its recipe's first line if and only if @NMD@ lines are absent. -gl_V_at = $(AM_V_GEN) - -## end gnulib module gen-header - -## begin gnulib module snippet/_Noreturn - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -_NORETURN_H=$(srcdir)/_Noreturn.h - -EXTRA_DIST += _Noreturn.h - -## end gnulib module snippet/_Noreturn - -## begin gnulib module snippet/arg-nonnull - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -ARG_NONNULL_H=$(srcdir)/arg-nonnull.h - -EXTRA_DIST += arg-nonnull.h - -## end gnulib module snippet/arg-nonnull - -## begin gnulib module snippet/c++defs - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -CXXDEFS_H=$(srcdir)/c++defs.h - -EXTRA_DIST += c++defs.h - -## end gnulib module snippet/c++defs - -## begin gnulib module snippet/warn-on-use - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -WARN_ON_USE_H=$(srcdir)/warn-on-use.h - -EXTRA_DIST += warn-on-use.h - -## end gnulib module snippet/warn-on-use - -## begin gnulib module dummy - -libtests_a_SOURCES += dummy.c - -## end gnulib module dummy - -all: all-notice -all-notice: - @echo '## ---------------------------------------------------- ##' - @echo '## ------------------- Gnulib tests ------------------- ##' - @echo '## You can ignore compiler warnings in this directory. ##' - @echo '## ---------------------------------------------------- ##' - -check-am: check-notice -check-notice: - @echo '## ---------------------------------------------------------------------- ##' - @echo '## ---------------------------- Gnulib tests ---------------------------- ##' - @echo '## Please report test failures in this directory to . ##' - @echo '## ---------------------------------------------------------------------- ##' - -# Clean up after Solaris cc. -clean-local: - rm -rf SunWS_cache - -mostlyclean-local: mostlyclean-generic - @for dir in '' $(MOSTLYCLEANDIRS); do \ - if test -n "$$dir" && test -d $$dir; then \ - echo "rmdir $$dir"; rmdir $$dir; \ - fi; \ - done; \ - : diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/_Noreturn.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/_Noreturn.h deleted file mode 100644 index 7326bd47..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/_Noreturn.h +++ /dev/null @@ -1,50 +0,0 @@ -/* A C macro for declaring that a function does not return. - Copyright (C) 2011-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _Noreturn -# if (defined __cplusplus \ - && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ - || (defined _MSC_VER && 1900 <= _MSC_VER)) \ - && 0) - /* [[noreturn]] is not practically usable, because with it the syntax - extern _Noreturn void func (...); - would not be valid; such a declaration would only be valid with 'extern' - and '_Noreturn' swapped, or without the 'extern' keyword. However, some - AIX system header files and several gnulib header files use precisely - this syntax with 'extern'. */ -# define _Noreturn [[noreturn]] -# elif (defined __clang__ && __clang_major__ < 16 \ - && defined _GL_WORK_AROUND_LLVM_BUG_59792) - /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around - that rare LLVM bug, though you may get many false-alarm warnings. */ -# define _Noreturn -# elif ((!defined __cplusplus || defined __clang__) \ - && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || (!defined __STRICT_ANSI__ \ - && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))))) - /* _Noreturn works as-is. */ -# elif (2 < __GNUC__ + (8 <= __GNUC_MINOR__) || defined __clang__ \ - || 0x5110 <= __SUNPRO_C) -# define _Noreturn __attribute__ ((__noreturn__)) -# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn -# endif -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/arg-nonnull.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/arg-nonnull.h deleted file mode 100644 index 46c711ca..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/arg-nonnull.h +++ /dev/null @@ -1,26 +0,0 @@ -/* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools - that the values passed as arguments n, ..., m must be non-NULL pointers. - n = 1 stands for the first argument, n = 2 for the second argument etc. */ -#ifndef _GL_ARG_NONNULL -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__ -# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) -# else -# define _GL_ARG_NONNULL(params) -# endif -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/c++defs.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/c++defs.h deleted file mode 100644 index eb66967b..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/c++defs.h +++ /dev/null @@ -1,337 +0,0 @@ -/* C++ compatible function declaration macros. - Copyright (C) 2010-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GL_CXXDEFS_H -#define _GL_CXXDEFS_H - -/* Begin/end the GNULIB_NAMESPACE namespace. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { -# define _GL_END_NAMESPACE } -#else -# define _GL_BEGIN_NAMESPACE -# define _GL_END_NAMESPACE -#endif - -/* The three most frequent use cases of these macros are: - - * For providing a substitute for a function that is missing on some - platforms, but is declared and works fine on the platforms on which - it exists: - - #if @GNULIB_FOO@ - # if !@HAVE_FOO@ - _GL_FUNCDECL_SYS (foo, ...); - # endif - _GL_CXXALIAS_SYS (foo, ...); - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif - - * For providing a replacement for a function that exists on all platforms, - but is broken/insufficient and needs to be replaced on some platforms: - - #if @GNULIB_FOO@ - # if @REPLACE_FOO@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef foo - # define foo rpl_foo - # endif - _GL_FUNCDECL_RPL (foo, ...); - _GL_CXXALIAS_RPL (foo, ...); - # else - _GL_CXXALIAS_SYS (foo, ...); - # endif - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif - - * For providing a replacement for a function that exists on some platforms - but is broken/insufficient and needs to be replaced on some of them and - is additionally either missing or undeclared on some other platforms: - - #if @GNULIB_FOO@ - # if @REPLACE_FOO@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef foo - # define foo rpl_foo - # endif - _GL_FUNCDECL_RPL (foo, ...); - _GL_CXXALIAS_RPL (foo, ...); - # else - # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ - _GL_FUNCDECL_SYS (foo, ...); - # endif - _GL_CXXALIAS_SYS (foo, ...); - # endif - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif -*/ - -/* _GL_EXTERN_C declaration; - performs the declaration with C linkage. */ -#if defined __cplusplus -# define _GL_EXTERN_C extern "C" -#else -# define _GL_EXTERN_C extern -#endif - -/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); - declares a replacement function, named rpl_func, with the given prototype, - consisting of return type, parameters, and attributes. - Example: - _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) - _GL_ARG_NONNULL ((1))); - - Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front - of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode. (That's - because - [[...]] extern "C" ; - is invalid syntax in C++.) - */ -#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ - _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) -#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C rettype rpl_func parameters_and_attributes - -/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); - declares the system function, named func, with the given prototype, - consisting of return type, parameters, and attributes. - Example: - _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) - _GL_ARG_NONNULL ((1))); - */ -#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C rettype func parameters_and_attributes - -/* _GL_CXXALIAS_RPL (func, rettype, parameters); - declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to rpl_func, if GNULIB_NAMESPACE is defined. - Example: - _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); - - Wrapping rpl_func in an object with an inline conversion operator - avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is - actually used in the program. */ -#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return ::rpl_func; \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_MDA (func, rettype, parameters); - is to be used when func is a Microsoft deprecated alias, on native Windows. - It declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to _func, if GNULIB_NAMESPACE is defined. - Example: - _GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...)); - */ -#define _GL_CXXALIAS_MDA(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_1 (func, _##func, rettype, parameters) - -/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); - is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); - except that the C function rpl_func may have a slightly different - declaration. A cast is used to silence the "invalid conversion" error - that would otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast(::rpl_func); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_MDA_CAST (func, rettype, parameters); - is like _GL_CXXALIAS_MDA (func, rettype, parameters); - except that the C function func may have a slightly different declaration. - A cast is used to silence the "invalid conversion" error that would - otherwise occur. */ -#define _GL_CXXALIAS_MDA_CAST(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_CAST_1 (func, _##func, rettype, parameters) - -/* _GL_CXXALIAS_SYS (func, rettype, parameters); - declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to the system provided function func, if GNULIB_NAMESPACE - is defined. - Example: - _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); - - Wrapping func in an object with an inline conversion operator - avoids a reference to func unless GNULIB_NAMESPACE::func is - actually used in the program. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return ::func; \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); - is like _GL_CXXALIAS_SYS (func, rettype, parameters); - except that the C function func may have a slightly different declaration. - A cast is used to silence the "invalid conversion" error that would - otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast(::func); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); - is like _GL_CXXALIAS_SYS (func, rettype, parameters); - except that the C function is picked among a set of overloaded functions, - namely the one with rettype2 and parameters2. Two consecutive casts - are used to silence the "cannot find a match" and "invalid conversion" - errors that would otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE - /* The outer cast must be a reinterpret_cast. - The inner cast: When the function is defined as a set of overloaded - functions, it works as a static_cast<>, choosing the designated variant. - When the function is defined as a single variant, it works as a - reinterpret_cast<>. The parenthesized cast syntax works both ways. */ -# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast((rettype2 (*) parameters2)(::func)); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIASWARN (func); - causes a warning to be emitted when ::func is used but not when - GNULIB_NAMESPACE::func is used. func must be defined without overloaded - variants. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIASWARN(func) \ - _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) -# define _GL_CXXALIASWARN_1(func,namespace) \ - _GL_CXXALIASWARN_2 (func, namespace) -/* To work around GCC bug , - we enable the warning only when not optimizing. */ -# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__) -# define _GL_CXXALIASWARN_2(func,namespace) \ - _GL_WARN_ON_USE (func, \ - "The symbol ::" #func " refers to the system function. " \ - "Use " #namespace "::" #func " instead.") -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -# define _GL_CXXALIASWARN_2(func,namespace) \ - extern __typeof__ (func) func -# else -# define _GL_CXXALIASWARN_2(func,namespace) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -# endif -#else -# define _GL_CXXALIASWARN(func) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); - causes a warning to be emitted when the given overloaded variant of ::func - is used but not when GNULIB_NAMESPACE::func is used. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ - _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ - GNULIB_NAMESPACE) -# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ - _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) -/* To work around GCC bug , - we enable the warning only when not optimizing. */ -# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__) -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_WARN_ON_USE_CXX (func, rettype, rettype, parameters_and_attributes, \ - "The symbol ::" #func " refers to the system function. " \ - "Use " #namespace "::" #func " instead.") -# else -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -# endif -#else -# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -#endif /* _GL_CXXDEFS_H */ diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/dummy.c b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/dummy.c deleted file mode 100644 index 673aafaf..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/dummy.c +++ /dev/null @@ -1,31 +0,0 @@ -/* A dummy file, to prevent empty libraries from breaking builds. - Copyright (C) 2004, 2007, 2009-2024 Free Software Foundation, Inc. - - This file is in the public domain. */ - -/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create - libraries without any object files. You might get an error like: - - > ar cru .libs/libgl.a - > ar: no archive members specified - - Compiling this file, and adding its object file to the library, will - prevent the library from being empty. */ - -/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries - that don't export any symbol. You might get an error like: - - > cc ... libgnu.a - > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a - - Compiling this file, and adding its object file to the library, will - prevent the library from exporting no symbols. */ - -#ifdef __sun -/* This declaration ensures that the library will export at least 1 symbol. */ -int gl_dummy_symbol; -#else -/* This declaration is solely to ensure that after preprocessing - this file is never empty. */ -typedef int dummy; -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/warn-on-use.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/warn-on-use.h deleted file mode 100644 index 8f4d40dc..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-2.result/liboath/gl/tests/warn-on-use.h +++ /dev/null @@ -1,149 +0,0 @@ -/* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* _GL_WARN_ON_USE (function, "literal string") issues a declaration - for FUNCTION which will then trigger a compiler warning containing - the text of "literal string" anywhere that function is called, if - supported by the compiler. If the compiler does not support this - feature, the macro expands to an unused extern declaration. - - _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the - attribute used in _GL_WARN_ON_USE. If the compiler does not support - this feature, it expands to empty. - - These macros are useful for marking a function as a potential - portability trap, with the intent that "literal string" include - instructions on the replacement function that should be used - instead. - _GL_WARN_ON_USE is for functions with 'extern' linkage. - _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline' - linkage. - - However, one of the reasons that a function is a portability trap is - if it has the wrong signature. Declaring FUNCTION with a different - signature in C is a compilation error, so this macro must use the - same type as any existing declaration so that programs that avoid - the problematic FUNCTION do not fail to compile merely because they - included a header that poisoned the function. But this implies that - _GL_WARN_ON_USE is only safe to use if FUNCTION is known to already - have a declaration. Use of this macro implies that there must not - be any other macro hiding the declaration of FUNCTION; but - undefining FUNCTION first is part of the poisoning process anyway - (although for symbols that are provided only via a macro, the result - is a compilation error rather than a warning containing - "literal string"). Also note that in C++, it is only safe to use if - FUNCTION has no overloads. - - For an example, it is possible to poison 'getline' by: - - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], - [getline]) in configure.ac, which potentially defines - HAVE_RAW_DECL_GETLINE - - adding this code to a header that wraps the system : - #undef getline - #if HAVE_RAW_DECL_GETLINE - _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" - "not universally present; use the gnulib module getline"); - #endif - - It is not possible to directly poison global variables. But it is - possible to write a wrapper accessor function, and poison that - (less common usage, like &environ, will cause a compilation error - rather than issue the nice warning, but the end result of informing - the developer about their portability problem is still achieved): - #if HAVE_RAW_DECL_ENVIRON - static char *** - rpl_environ (void) { return &environ; } - _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); - # undef environ - # define environ (*rpl_environ ()) - #endif - or better (avoiding contradictory use of 'static' and 'extern'): - #if HAVE_RAW_DECL_ENVIRON - static char *** - _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared") - rpl_environ (void) { return &environ; } - # undef environ - # define environ (*rpl_environ ()) - #endif - */ -#ifndef _GL_WARN_ON_USE - -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message))) -# define _GL_WARN_ON_USE_ATTRIBUTE(message) \ - __attribute__ ((__warning__ (message))) -# elif __clang_major__ >= 4 -/* Another compiler attribute is available in clang. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function \ - __attribute__ ((__diagnose_if__ (1, message, "warning"))) -# define _GL_WARN_ON_USE_ATTRIBUTE(message) \ - __attribute__ ((__diagnose_if__ (1, message, "warning"))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -/* Verify the existence of the function. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function -# define _GL_WARN_ON_USE_ATTRIBUTE(message) -# else /* Unsupported. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C int _gl_warn_on_use -# define _GL_WARN_ON_USE_ATTRIBUTE(message) -# endif -#endif - -/* _GL_WARN_ON_USE_CXX (function, rettype_gcc, rettype_clang, parameters_and_attributes, "message") - is like _GL_WARN_ON_USE (function, "message"), except that in C++ mode the - function is declared with the given prototype, consisting of return type, - parameters, and attributes. - This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does - not work in this case. */ -#ifndef _GL_WARN_ON_USE_CXX -# if !defined __cplusplus -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ - _GL_WARN_ON_USE (function, msg) -# else -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -extern rettype_gcc function parameters_and_attributes \ - __attribute__ ((__warning__ (msg))) -# elif __clang_major__ >= 4 -/* Another compiler attribute is available in clang. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -extern rettype_clang function parameters_and_attributes \ - __attribute__ ((__diagnose_if__ (1, msg, "warning"))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -/* Verify the existence of the function. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -extern rettype_gcc function parameters_and_attributes -# else /* Unsupported. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -_GL_WARN_EXTERN_C int _gl_warn_on_use -# endif -# endif -#endif - -/* _GL_WARN_EXTERN_C declaration; - performs the declaration with C linkage. */ -#ifndef _GL_WARN_EXTERN_C -# if defined __cplusplus -# define _GL_WARN_EXTERN_C extern "C" -# else -# define _GL_WARN_EXTERN_C extern -# endif -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.out b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.out index 9d8e4bc1..caf0f63c 100644 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.out +++ b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.out @@ -157,12 +157,6 @@ File list: m4/wchar_t.m4 m4/wint_t.m4 m4/zzgnulib.m4 - lib/_Noreturn.h -> tests/_Noreturn.h - lib/arg-nonnull.h -> tests/arg-nonnull.h - lib/c++defs.h -> tests/c++defs.h - lib/dummy.c -> tests/dummy.c - lib/warn-on-use.h -> tests/warn-on-use.h -Creating directory ./gl/tests Creating directory ./build-aux Updating file gl/cdefs.h (backup in gl/cdefs.h~) Updating file gl/limits.in.h (backup in gl/limits.in.h~) @@ -171,14 +165,9 @@ Updating file gl/m4/string_h.m4 (backup in gl/m4/string_h.m4~) Updating file gl/m4/time_h.m4 (backup in gl/m4/time_h.m4~) Updating file gl/stdlib.in.h (backup in gl/stdlib.in.h~) Updating file gl/string.in.h (backup in gl/string.in.h~) -Copying file gl/tests/_Noreturn.h -Copying file gl/tests/arg-nonnull.h -Copying file gl/tests/c++defs.h -Copying file gl/tests/dummy.c -Copying file gl/tests/warn-on-use.h Updating file gl/time.in.h (backup in gl/time.in.h~) +Updating gl/m4/gnulib-comp.m4 (backup in gl/m4/gnulib-comp.m4~) Updating gl/Makefile.am (backup in gl/Makefile.am~) -Creating gl/tests/Makefile.am Finished. You may need to add #include directives for the following .h files. @@ -190,7 +179,6 @@ You may need to add #include directives for the following .h files. Don't forget to - add "gl/Makefile" to AC_CONFIG_FILES in ./configure.ac, - - add "gl/tests/Makefile" to AC_CONFIG_FILES in ./configure.ac, - mention "gl" in SUBDIRS in Makefile.am, - mention "-I gl/m4" in ACLOCAL_AMFLAGS in Makefile.am or add an AC_CONFIG_MACRO_DIRS([gl/m4]) invocation in ./configure.ac, diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/m4/gnulib-comp.m4 b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/m4/gnulib-comp.m4 index 5dc02b45..606359f1 100644 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/m4/gnulib-comp.m4 +++ b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/m4/gnulib-comp.m4 @@ -306,8 +306,6 @@ changequote([, ])dnl m4_pushdef([GL_MACRO_PREFIX], [gltests]) m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) gl_COMMON - AC_REQUIRE([gl_CC_ALLOW_WARNINGS]) - AC_REQUIRE([gl_CXX_ALLOW_WARNINGS]) gl_source_base='gl/tests' gl_source_base_prefix= changequote(,)dnl @@ -316,7 +314,6 @@ changequote([, ])dnl AC_SUBST([gltests_WITNESS]) gl_module_indicator_condition=$gltests_WITNESS m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) - gl_VALGRIND_TESTS m4_popdef([gl_MODULE_INDICATOR_CONDITION]) m4_ifval(gltests_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || @@ -363,8 +360,6 @@ changequote([, ])dnl AC_SUBST([gltests_LIBOBJDEPS], [$gltests_libobjdeps]) ]) AC_REQUIRE([gl_CC_GNULIB_WARNINGS]) - LIBTESTS_LIBDEPS="$gltests_libdeps" - AC_SUBST([LIBTESTS_LIBDEPS]) ]) # Like AC_LIBOBJ, except that the module name goes @@ -525,9 +520,4 @@ AC_DEFUN([gl_FILE_LIST], [ m4/wchar_t.m4 m4/wint_t.m4 m4/zzgnulib.m4 - tests=lib/_Noreturn.h - tests=lib/arg-nonnull.h - tests=lib/c++defs.h - tests=lib/dummy.c - tests=lib/warn-on-use.h ]) diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/Makefile.am b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/Makefile.am deleted file mode 100644 index 49090f67..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/Makefile.am +++ /dev/null @@ -1,165 +0,0 @@ -## DO NOT EDIT! GENERATED AUTOMATICALLY! -## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2024 Free Software Foundation, Inc. -# -# This file 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 file 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 file. If not, see . -# -# As a special exception to the GNU General Public License, -# this file may be distributed as part of a program that -# contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. - -AUTOMAKE_OPTIONS = 1.14 foreign - -SUBDIRS = . -TESTS = -XFAIL_TESTS = -TESTS_ENVIRONMENT = -noinst_PROGRAMS = -check_PROGRAMS = -EXTRA_PROGRAMS = -noinst_HEADERS = -noinst_LIBRARIES = -check_LIBRARIES = libtests.a -pkgdata_DATA = -EXTRA_DIST = -BUILT_SOURCES = -SUFFIXES = -MOSTLYCLEANFILES = core *.stackdump -MOSTLYCLEANDIRS = -CLEANFILES = -DISTCLEANFILES = -MAINTAINERCLEANFILES = - -CFLAGS = @GL_CFLAG_ALLOW_WARNINGS@ $(GL_CFLAG_GNULIB_WARNINGS) @CFLAGS@ -CXXFLAGS = @GL_CXXFLAG_ALLOW_WARNINGS@ @CXXFLAGS@ - -AM_CPPFLAGS = \ - -D@gltests_WITNESS@=1 \ - -I. -I$(srcdir) \ - -I../.. -I$(srcdir)/../.. \ - -I../../gl -I$(srcdir)/../../gl - -LDADD = libtests.a ../../gl/libgnu.la libtests.a ../../gl/libgnu.la libtests.a $(LIBTESTS_LIBDEPS) - -libtests_a_SOURCES = -libtests_a_LIBADD = $(gltests_LIBOBJS) -libtests_a_DEPENDENCIES = $(gltests_LIBOBJS) -EXTRA_libtests_a_SOURCES = -AM_LIBTOOLFLAGS = --preserve-dup-deps - -TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' -IGNORE_SKIPPED_LOGS = 1 - -## begin gnulib module gen-header - -# In 'sed', replace the pattern space with a "DO NOT EDIT" comment. -SED_HEADER_NOEDIT = s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */, - -# '$(SED_HEADER_STDOUT) -e "..."' runs 'sed' but first outputs "DO NOT EDIT". -SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G - -# '$(SED_HEADER_TO_AT_t) FILE' copies FILE to $@-t, prepending a leading -# "DO_NOT_EDIT". Although this could be done more simply via: -# SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) > $@-t -# the -n and 'w' avoid a fork+exec, at least when GNU Make is used. -SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' - -# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that -# is its recipe's first line if and only if @NMD@ lines are absent. -gl_V_at = $(AM_V_GEN) - -## end gnulib module gen-header - -## begin gnulib module snippet/_Noreturn - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -_NORETURN_H=$(srcdir)/_Noreturn.h - -EXTRA_DIST += _Noreturn.h - -## end gnulib module snippet/_Noreturn - -## begin gnulib module snippet/arg-nonnull - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -ARG_NONNULL_H=$(srcdir)/arg-nonnull.h - -EXTRA_DIST += arg-nonnull.h - -## end gnulib module snippet/arg-nonnull - -## begin gnulib module snippet/c++defs - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -CXXDEFS_H=$(srcdir)/c++defs.h - -EXTRA_DIST += c++defs.h - -## end gnulib module snippet/c++defs - -## begin gnulib module snippet/warn-on-use - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all makefiles that -# need it. This is ensured by the applicability 'all' defined above. - -WARN_ON_USE_H=$(srcdir)/warn-on-use.h - -EXTRA_DIST += warn-on-use.h - -## end gnulib module snippet/warn-on-use - -## begin gnulib module dummy - -libtests_a_SOURCES += dummy.c - -## end gnulib module dummy - -all: all-notice -all-notice: - @echo '## ---------------------------------------------------- ##' - @echo '## ------------------- Gnulib tests ------------------- ##' - @echo '## You can ignore compiler warnings in this directory. ##' - @echo '## ---------------------------------------------------- ##' - -check-am: check-notice -check-notice: - @echo '## ---------------------------------------------------------------------- ##' - @echo '## ---------------------------- Gnulib tests ---------------------------- ##' - @echo '## Please report test failures in this directory to . ##' - @echo '## ---------------------------------------------------------------------- ##' - -# Clean up after Solaris cc. -clean-local: - rm -rf SunWS_cache - -mostlyclean-local: mostlyclean-generic - @for dir in '' $(MOSTLYCLEANDIRS); do \ - if test -n "$$dir" && test -d $$dir; then \ - echo "rmdir $$dir"; rmdir $$dir; \ - fi; \ - done; \ - : diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/_Noreturn.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/_Noreturn.h deleted file mode 100644 index 7326bd47..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/_Noreturn.h +++ /dev/null @@ -1,50 +0,0 @@ -/* A C macro for declaring that a function does not return. - Copyright (C) 2011-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _Noreturn -# if (defined __cplusplus \ - && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ - || (defined _MSC_VER && 1900 <= _MSC_VER)) \ - && 0) - /* [[noreturn]] is not practically usable, because with it the syntax - extern _Noreturn void func (...); - would not be valid; such a declaration would only be valid with 'extern' - and '_Noreturn' swapped, or without the 'extern' keyword. However, some - AIX system header files and several gnulib header files use precisely - this syntax with 'extern'. */ -# define _Noreturn [[noreturn]] -# elif (defined __clang__ && __clang_major__ < 16 \ - && defined _GL_WORK_AROUND_LLVM_BUG_59792) - /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around - that rare LLVM bug, though you may get many false-alarm warnings. */ -# define _Noreturn -# elif ((!defined __cplusplus || defined __clang__) \ - && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || (!defined __STRICT_ANSI__ \ - && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))))) - /* _Noreturn works as-is. */ -# elif (2 < __GNUC__ + (8 <= __GNUC_MINOR__) || defined __clang__ \ - || 0x5110 <= __SUNPRO_C) -# define _Noreturn __attribute__ ((__noreturn__)) -# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn -# endif -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/arg-nonnull.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/arg-nonnull.h deleted file mode 100644 index 46c711ca..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/arg-nonnull.h +++ /dev/null @@ -1,26 +0,0 @@ -/* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools - that the values passed as arguments n, ..., m must be non-NULL pointers. - n = 1 stands for the first argument, n = 2 for the second argument etc. */ -#ifndef _GL_ARG_NONNULL -# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__ -# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) -# else -# define _GL_ARG_NONNULL(params) -# endif -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/c++defs.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/c++defs.h deleted file mode 100644 index eb66967b..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/c++defs.h +++ /dev/null @@ -1,337 +0,0 @@ -/* C++ compatible function declaration macros. - Copyright (C) 2010-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GL_CXXDEFS_H -#define _GL_CXXDEFS_H - -/* Begin/end the GNULIB_NAMESPACE namespace. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { -# define _GL_END_NAMESPACE } -#else -# define _GL_BEGIN_NAMESPACE -# define _GL_END_NAMESPACE -#endif - -/* The three most frequent use cases of these macros are: - - * For providing a substitute for a function that is missing on some - platforms, but is declared and works fine on the platforms on which - it exists: - - #if @GNULIB_FOO@ - # if !@HAVE_FOO@ - _GL_FUNCDECL_SYS (foo, ...); - # endif - _GL_CXXALIAS_SYS (foo, ...); - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif - - * For providing a replacement for a function that exists on all platforms, - but is broken/insufficient and needs to be replaced on some platforms: - - #if @GNULIB_FOO@ - # if @REPLACE_FOO@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef foo - # define foo rpl_foo - # endif - _GL_FUNCDECL_RPL (foo, ...); - _GL_CXXALIAS_RPL (foo, ...); - # else - _GL_CXXALIAS_SYS (foo, ...); - # endif - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif - - * For providing a replacement for a function that exists on some platforms - but is broken/insufficient and needs to be replaced on some of them and - is additionally either missing or undeclared on some other platforms: - - #if @GNULIB_FOO@ - # if @REPLACE_FOO@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef foo - # define foo rpl_foo - # endif - _GL_FUNCDECL_RPL (foo, ...); - _GL_CXXALIAS_RPL (foo, ...); - # else - # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ - _GL_FUNCDECL_SYS (foo, ...); - # endif - _GL_CXXALIAS_SYS (foo, ...); - # endif - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif -*/ - -/* _GL_EXTERN_C declaration; - performs the declaration with C linkage. */ -#if defined __cplusplus -# define _GL_EXTERN_C extern "C" -#else -# define _GL_EXTERN_C extern -#endif - -/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); - declares a replacement function, named rpl_func, with the given prototype, - consisting of return type, parameters, and attributes. - Example: - _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) - _GL_ARG_NONNULL ((1))); - - Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front - of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode. (That's - because - [[...]] extern "C" ; - is invalid syntax in C++.) - */ -#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ - _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) -#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C rettype rpl_func parameters_and_attributes - -/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); - declares the system function, named func, with the given prototype, - consisting of return type, parameters, and attributes. - Example: - _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) - _GL_ARG_NONNULL ((1))); - */ -#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C rettype func parameters_and_attributes - -/* _GL_CXXALIAS_RPL (func, rettype, parameters); - declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to rpl_func, if GNULIB_NAMESPACE is defined. - Example: - _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); - - Wrapping rpl_func in an object with an inline conversion operator - avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is - actually used in the program. */ -#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return ::rpl_func; \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_MDA (func, rettype, parameters); - is to be used when func is a Microsoft deprecated alias, on native Windows. - It declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to _func, if GNULIB_NAMESPACE is defined. - Example: - _GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...)); - */ -#define _GL_CXXALIAS_MDA(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_1 (func, _##func, rettype, parameters) - -/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); - is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); - except that the C function rpl_func may have a slightly different - declaration. A cast is used to silence the "invalid conversion" error - that would otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast(::rpl_func); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_MDA_CAST (func, rettype, parameters); - is like _GL_CXXALIAS_MDA (func, rettype, parameters); - except that the C function func may have a slightly different declaration. - A cast is used to silence the "invalid conversion" error that would - otherwise occur. */ -#define _GL_CXXALIAS_MDA_CAST(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_CAST_1 (func, _##func, rettype, parameters) - -/* _GL_CXXALIAS_SYS (func, rettype, parameters); - declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to the system provided function func, if GNULIB_NAMESPACE - is defined. - Example: - _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); - - Wrapping func in an object with an inline conversion operator - avoids a reference to func unless GNULIB_NAMESPACE::func is - actually used in the program. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return ::func; \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); - is like _GL_CXXALIAS_SYS (func, rettype, parameters); - except that the C function func may have a slightly different declaration. - A cast is used to silence the "invalid conversion" error that would - otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast(::func); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); - is like _GL_CXXALIAS_SYS (func, rettype, parameters); - except that the C function is picked among a set of overloaded functions, - namely the one with rettype2 and parameters2. Two consecutive casts - are used to silence the "cannot find a match" and "invalid conversion" - errors that would otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE - /* The outer cast must be a reinterpret_cast. - The inner cast: When the function is defined as a set of overloaded - functions, it works as a static_cast<>, choosing the designated variant. - When the function is defined as a single variant, it works as a - reinterpret_cast<>. The parenthesized cast syntax works both ways. */ -# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast((rettype2 (*) parameters2)(::func)); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIASWARN (func); - causes a warning to be emitted when ::func is used but not when - GNULIB_NAMESPACE::func is used. func must be defined without overloaded - variants. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIASWARN(func) \ - _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) -# define _GL_CXXALIASWARN_1(func,namespace) \ - _GL_CXXALIASWARN_2 (func, namespace) -/* To work around GCC bug , - we enable the warning only when not optimizing. */ -# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__) -# define _GL_CXXALIASWARN_2(func,namespace) \ - _GL_WARN_ON_USE (func, \ - "The symbol ::" #func " refers to the system function. " \ - "Use " #namespace "::" #func " instead.") -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -# define _GL_CXXALIASWARN_2(func,namespace) \ - extern __typeof__ (func) func -# else -# define _GL_CXXALIASWARN_2(func,namespace) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -# endif -#else -# define _GL_CXXALIASWARN(func) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); - causes a warning to be emitted when the given overloaded variant of ::func - is used but not when GNULIB_NAMESPACE::func is used. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ - _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ - GNULIB_NAMESPACE) -# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ - _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) -/* To work around GCC bug , - we enable the warning only when not optimizing. */ -# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__) -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_WARN_ON_USE_CXX (func, rettype, rettype, parameters_and_attributes, \ - "The symbol ::" #func " refers to the system function. " \ - "Use " #namespace "::" #func " instead.") -# else -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -# endif -#else -# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -#endif /* _GL_CXXDEFS_H */ diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/dummy.c b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/dummy.c deleted file mode 100644 index 673aafaf..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/dummy.c +++ /dev/null @@ -1,31 +0,0 @@ -/* A dummy file, to prevent empty libraries from breaking builds. - Copyright (C) 2004, 2007, 2009-2024 Free Software Foundation, Inc. - - This file is in the public domain. */ - -/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create - libraries without any object files. You might get an error like: - - > ar cru .libs/libgl.a - > ar: no archive members specified - - Compiling this file, and adding its object file to the library, will - prevent the library from being empty. */ - -/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries - that don't export any symbol. You might get an error like: - - > cc ... libgnu.a - > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a - - Compiling this file, and adding its object file to the library, will - prevent the library from exporting no symbols. */ - -#ifdef __sun -/* This declaration ensures that the library will export at least 1 symbol. */ -int gl_dummy_symbol; -#else -/* This declaration is solely to ensure that after preprocessing - this file is never empty. */ -typedef int dummy; -#endif diff --git a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/warn-on-use.h b/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/warn-on-use.h deleted file mode 100644 index 8f4d40dc..00000000 --- a/gnulib-tool-tests/import-tests/test-oath-toolkit-4.result/libpskc/gl/tests/warn-on-use.h +++ /dev/null @@ -1,149 +0,0 @@ -/* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* _GL_WARN_ON_USE (function, "literal string") issues a declaration - for FUNCTION which will then trigger a compiler warning containing - the text of "literal string" anywhere that function is called, if - supported by the compiler. If the compiler does not support this - feature, the macro expands to an unused extern declaration. - - _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the - attribute used in _GL_WARN_ON_USE. If the compiler does not support - this feature, it expands to empty. - - These macros are useful for marking a function as a potential - portability trap, with the intent that "literal string" include - instructions on the replacement function that should be used - instead. - _GL_WARN_ON_USE is for functions with 'extern' linkage. - _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline' - linkage. - - However, one of the reasons that a function is a portability trap is - if it has the wrong signature. Declaring FUNCTION with a different - signature in C is a compilation error, so this macro must use the - same type as any existing declaration so that programs that avoid - the problematic FUNCTION do not fail to compile merely because they - included a header that poisoned the function. But this implies that - _GL_WARN_ON_USE is only safe to use if FUNCTION is known to already - have a declaration. Use of this macro implies that there must not - be any other macro hiding the declaration of FUNCTION; but - undefining FUNCTION first is part of the poisoning process anyway - (although for symbols that are provided only via a macro, the result - is a compilation error rather than a warning containing - "literal string"). Also note that in C++, it is only safe to use if - FUNCTION has no overloads. - - For an example, it is possible to poison 'getline' by: - - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], - [getline]) in configure.ac, which potentially defines - HAVE_RAW_DECL_GETLINE - - adding this code to a header that wraps the system : - #undef getline - #if HAVE_RAW_DECL_GETLINE - _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" - "not universally present; use the gnulib module getline"); - #endif - - It is not possible to directly poison global variables. But it is - possible to write a wrapper accessor function, and poison that - (less common usage, like &environ, will cause a compilation error - rather than issue the nice warning, but the end result of informing - the developer about their portability problem is still achieved): - #if HAVE_RAW_DECL_ENVIRON - static char *** - rpl_environ (void) { return &environ; } - _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); - # undef environ - # define environ (*rpl_environ ()) - #endif - or better (avoiding contradictory use of 'static' and 'extern'): - #if HAVE_RAW_DECL_ENVIRON - static char *** - _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared") - rpl_environ (void) { return &environ; } - # undef environ - # define environ (*rpl_environ ()) - #endif - */ -#ifndef _GL_WARN_ON_USE - -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message))) -# define _GL_WARN_ON_USE_ATTRIBUTE(message) \ - __attribute__ ((__warning__ (message))) -# elif __clang_major__ >= 4 -/* Another compiler attribute is available in clang. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function \ - __attribute__ ((__diagnose_if__ (1, message, "warning"))) -# define _GL_WARN_ON_USE_ATTRIBUTE(message) \ - __attribute__ ((__diagnose_if__ (1, message, "warning"))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -/* Verify the existence of the function. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function -# define _GL_WARN_ON_USE_ATTRIBUTE(message) -# else /* Unsupported. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C int _gl_warn_on_use -# define _GL_WARN_ON_USE_ATTRIBUTE(message) -# endif -#endif - -/* _GL_WARN_ON_USE_CXX (function, rettype_gcc, rettype_clang, parameters_and_attributes, "message") - is like _GL_WARN_ON_USE (function, "message"), except that in C++ mode the - function is declared with the given prototype, consisting of return type, - parameters, and attributes. - This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does - not work in this case. */ -#ifndef _GL_WARN_ON_USE_CXX -# if !defined __cplusplus -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ - _GL_WARN_ON_USE (function, msg) -# else -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -extern rettype_gcc function parameters_and_attributes \ - __attribute__ ((__warning__ (msg))) -# elif __clang_major__ >= 4 -/* Another compiler attribute is available in clang. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -extern rettype_clang function parameters_and_attributes \ - __attribute__ ((__diagnose_if__ (1, msg, "warning"))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -/* Verify the existence of the function. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -extern rettype_gcc function parameters_and_attributes -# else /* Unsupported. */ -# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ -_GL_WARN_EXTERN_C int _gl_warn_on_use -# endif -# endif -#endif - -/* _GL_WARN_EXTERN_C declaration; - performs the declaration with C linkage. */ -#ifndef _GL_WARN_EXTERN_C -# if defined __cplusplus -# define _GL_WARN_EXTERN_C extern "C" -# else -# define _GL_WARN_EXTERN_C extern -# endif -#endif diff --git a/gnulib-tool-tests/info-tests/test-list.output b/gnulib-tool-tests/info-tests/test-list.output index 4771c725..fca472c5 100644 --- a/gnulib-tool-tests/info-tests/test-list.output +++ b/gnulib-tool-tests/info-tests/test-list.output @@ -1701,6 +1701,7 @@ utimens utimensat utmp va-args +valgrind-tests vararrays vasnprintf vasnprintf-gnu -- 2.39.5