From b2f8eb7a30dcf7c33ea26dfca31401a6786dcd99 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 28 Sep 2017 22:31:42 +0100 Subject: [PATCH] Move utils-selftests.c -> gdb/unittests/ This file was only under gdb/ currently because it predates the gdb/unittests/ directory. gdb/ChangeLog: 2017-09-28 Pedro Alves * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add unittests/common-utils-selftests.c. (SUBDIR_UNITTESTS_OBS): Add common-utils-selftests.o. (COMMON_OBS): Remove utils-selftests.o. * utils-selftests.c: Move to ... * unittests/common-utils-selftests.c: ... here and rename self test to "string_printf". --- gdb/ChangeLog | 10 ++++++++++ gdb/Makefile.in | 3 ++- .../common-utils-selftests.c} | 18 ++++-------------- 3 files changed, 16 insertions(+), 15 deletions(-) rename gdb/{utils-selftests.c => unittests/common-utils-selftests.c} (83%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2120df65e9d..ab9250c8902 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2017-09-28 Pedro Alves + + * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add + unittests/common-utils-selftests.c. + (SUBDIR_UNITTESTS_OBS): Add common-utils-selftests.o. + (COMMON_OBS): Remove utils-selftests.o. + * utils-selftests.c: Move to ... + * unittests/common-utils-selftests.c: ... here and rename self + test to "string_printf". + 2017-09-28 Alexander Shaposhnikov (tiny patch) * dwarf2read.c (open_and_init_dwp_file): Protect against dwp_file diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9004b350e4e..f3f1d404ba8 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -527,6 +527,7 @@ SUBDIR_PYTHON_CFLAGS = SUBDIR_UNITTESTS_SRCS = \ unittests/array-view-selftests.c \ + unittests/common-utils-selftests.c \ unittests/environ-selftests.c \ unittests/function-view-selftests.c \ unittests/offset-type-selftests.c \ @@ -537,6 +538,7 @@ SUBDIR_UNITTESTS_SRCS = \ SUBDIR_UNITTESTS_OBS = \ array-view-selftests.o \ + common-utils-selftests.o \ environ-selftests.o \ function-view-selftests.o \ offset-type-selftests.o \ @@ -1842,7 +1844,6 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ ui-out.o \ user-regs.o \ utils.o \ - utils-selftests.o \ valarith.o \ valops.o \ valprint.o \ diff --git a/gdb/utils-selftests.c b/gdb/unittests/common-utils-selftests.c similarity index 83% rename from gdb/utils-selftests.c rename to gdb/unittests/common-utils-selftests.c index 5a30a93c9de..71bc2dff7f6 100644 --- a/gdb/utils-selftests.c +++ b/gdb/unittests/common-utils-selftests.c @@ -17,19 +17,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "defs.h" +#include "common-defs.h" #include "selftest.h" -#if GDB_SELF_TEST - namespace selftests { -/* common-utils self tests. Defined here instead of in - common/common-utils.c because that file is shared with - gdbserver. */ - static void -common_utils_tests (void) +string_printf_tests () { SELF_CHECK (string_printf ("%s", "") == ""); SELF_CHECK (string_printf ("%d comes before 2", 1) == "1 comes before 2"); @@ -49,12 +43,8 @@ common_utils_tests (void) } /* namespace selftests */ -#endif - void -_initialize_utils_selftests (void) +_initialize_common_utils_selftests () { -#if GDB_SELF_TEST - selftests::register_test ("common-utils", selftests::common_utils_tests); -#endif + selftests::register_test ("string_printf", selftests::string_printf_tests); } -- 2.30.2