From: Simon Marchi Date: Thu, 12 Mar 2020 18:19:38 +0000 (-0400) Subject: Move gdb/selftest.m4 to gdbsupport/selftest.m4 X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=272cd5a31e7ff16fe46a5532e857b98229404c48;p=deliverable%2Fbinutils-gdb.git Move gdb/selftest.m4 to gdbsupport/selftest.m4 The selftest.m4 file is used by gdb, gdbserver and gdbsupport, I think it belongs in gdbsupport. gdb/ChangeLog: * selftest.m4: Move to gdbsupport/. * acinclude.m4: Update path to selftest.m4. gdbserver/ChangeLog: * acinclude.m4: Update path to selftest.m4. gdbsupport/ChangeLog: * selftest.m4: Moved from gdb/. * acinclude.m4: Update path to selftest.m4. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c592b56142..25538378f3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-03-12 Simon Marchi + + * selftest.m4: Move to gdbsupport/. + * acinclude.m4: Update path to selftest.m4. + 2020-03-12 Simon Marchi * Makefile.in (SUBDIR_UNITTESTS_SRCS): Rename to... diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 14304bbe50..852a71c3f1 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -16,7 +16,7 @@ m4_include(../gdbsupport/warning.m4) m4_include(sanitize.m4) # This gets GDB_AC_SELFTEST. -m4_include(selftest.m4) +m4_include(../gdbsupport/selftest.m4) dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. m4_include(../bfd/bfd.m4) diff --git a/gdb/selftest.m4 b/gdb/selftest.m4 deleted file mode 100644 index 3624f25f24..0000000000 --- a/gdb/selftest.m4 +++ /dev/null @@ -1,50 +0,0 @@ -dnl Copyright (C) 2018-2020 Free Software Foundation, Inc. -dnl -dnl This file is part of GDB. -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program. If not, see . - -dnl GDB_AC_SELFTEST(ACTION-IF-ENABLED) -dnl -dnl Enable the unit/self tests if needed. If they are enabled, AC_DEFINE -dnl the GDB_SELF_TEST macro, and execute ACTION-IF-ENABLED. - -AC_DEFUN([GDB_AC_SELFTEST],[ -# Check whether we will enable the inclusion of unit tests when -# compiling GDB. -# -# The default value of this option changes depending whether we're on -# development mode (in which case it's "true") or not (in which case -# it's "false"). The $development variable is set by the GDB_AC_COMMON -# macro, which must therefore be used before GDB_AC_SELFTEST. - -AS_IF([test "x$development" != xtrue && test "x$development" != xfalse], - [AC_MSG_ERROR([Invalid value for \$development, got "$development", expecting "true" or "false".])]) - -AC_ARG_ENABLE(unit-tests, -AS_HELP_STRING([--enable-unit-tests], -[Enable the inclusion of unit tests when compiling GDB]), -[case "${enableval}" in - yes) enable_unittests=true ;; - no) enable_unittests=false ;; - *) AC_MSG_ERROR( -[bad value ${enableval} for --{enable,disable}-unit-tests option]) ;; -esac], [enable_unittests=$development]) - -if $enable_unittests; then - AC_DEFINE(GDB_SELF_TEST, 1, - [Define if self-testing features should be enabled]) - $1 -fi -]) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 1cf8ddfa1b..11d6c792d0 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-03-12 Simon Marchi + + * acinclude.m4: Update path to selftest.m4. + 2020-03-12 Simon Marchi * configure.ac: Don't source bfd/development.sh, move diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4 index 00476bb055..e0d2bfa213 100644 --- a/gdbserver/acinclude.m4 +++ b/gdbserver/acinclude.m4 @@ -32,7 +32,7 @@ m4_include(../gdb/ptrace.m4) m4_include(../gdb/ax_cxx_compile_stdcxx.m4) dnl For GDB_AC_SELFTEST. -m4_include(../gdb/selftest.m4) +m4_include(../gdbsupport/selftest.m4) m4_include([../config/ax_pthread.m4]) diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index e7474e1418..4b678eb06c 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,8 @@ +2020-03-12 Simon Marchi + + * selftest.m4: Moved from gdb/. + * acinclude.m4: Update path to selftest.m4. + 2020-03-12 Simon Marchi * configure.ac: Don't source bfd/development.sh. diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index 360ad3fd01..7ed2e6fac2 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -122,8 +122,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/codeset.m4 \ $(top_srcdir)/../bfd/bfd.m4 $(top_srcdir)/common.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/../gdb/ax_cxx_compile_stdcxx.m4 \ - $(top_srcdir)/../gdb/libiberty.m4 \ - $(top_srcdir)/../gdb/selftest.m4 \ + $(top_srcdir)/../gdb/libiberty.m4 $(top_srcdir)/selftest.m4 \ $(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/gdbsupport/acinclude.m4 b/gdbsupport/acinclude.m4 index d638ebcb54..4c86c4f8de 100644 --- a/gdbsupport/acinclude.m4 +++ b/gdbsupport/acinclude.m4 @@ -3,7 +3,7 @@ m4_include([common.m4]) m4_include([../config/ax_pthread.m4]) m4_include([../gdb/ax_cxx_compile_stdcxx.m4]) m4_include([../gdb/libiberty.m4]) -m4_include([../gdb/selftest.m4]) +m4_include([selftest.m4]) m4_include([../gdb/ptrace.m4]) dnl This gets AM_GDB_WARNINGS. diff --git a/gdbsupport/selftest.m4 b/gdbsupport/selftest.m4 new file mode 100644 index 0000000000..3624f25f24 --- /dev/null +++ b/gdbsupport/selftest.m4 @@ -0,0 +1,50 @@ +dnl Copyright (C) 2018-2020 Free Software Foundation, Inc. +dnl +dnl This file is part of GDB. +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program. If not, see . + +dnl GDB_AC_SELFTEST(ACTION-IF-ENABLED) +dnl +dnl Enable the unit/self tests if needed. If they are enabled, AC_DEFINE +dnl the GDB_SELF_TEST macro, and execute ACTION-IF-ENABLED. + +AC_DEFUN([GDB_AC_SELFTEST],[ +# Check whether we will enable the inclusion of unit tests when +# compiling GDB. +# +# The default value of this option changes depending whether we're on +# development mode (in which case it's "true") or not (in which case +# it's "false"). The $development variable is set by the GDB_AC_COMMON +# macro, which must therefore be used before GDB_AC_SELFTEST. + +AS_IF([test "x$development" != xtrue && test "x$development" != xfalse], + [AC_MSG_ERROR([Invalid value for \$development, got "$development", expecting "true" or "false".])]) + +AC_ARG_ENABLE(unit-tests, +AS_HELP_STRING([--enable-unit-tests], +[Enable the inclusion of unit tests when compiling GDB]), +[case "${enableval}" in + yes) enable_unittests=true ;; + no) enable_unittests=false ;; + *) AC_MSG_ERROR( +[bad value ${enableval} for --{enable,disable}-unit-tests option]) ;; +esac], [enable_unittests=$development]) + +if $enable_unittests; then + AC_DEFINE(GDB_SELF_TEST, 1, + [Define if self-testing features should be enabled]) + $1 +fi +])