From patchwork Thu Mar 5 19:30:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 38437 Received: (qmail 64276 invoked by alias); 5 Mar 2020 19:30:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 64158 invoked by uid 89); 5 Mar 2020 19:30:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_SOFTFAIL autolearn=ham version=3.3.1 spammy=H*RU:sk:barracu, HX-Spam-Relays-External:sk:barracu, H*r:sk:barracu, HContent-Transfer-Encoding:8bit X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 05 Mar 2020 19:30:22 +0000 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id KFQHlqahAvK4YaGW (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 05 Mar 2020 14:30:13 -0500 (EST) Received: from epycamd.internal.efficios.com (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) by smtp.ebox.ca (Postfix) with ESMTP id 23606441D64; Thu, 5 Mar 2020 14:30:13 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/4] Don't include selftests objects in build when unit tests are disabled Date: Thu, 5 Mar 2020 14:30:10 -0500 Message-Id: <20200305193011.25939-3-simon.marchi@efficios.com> In-Reply-To: <20200305193011.25939-1-simon.marchi@efficios.com> References: <20200305193011.25939-1-simon.marchi@efficios.com> MIME-Version: 1.0 While working on the preceding selftests patches, I noticed that some selftests-specific files are included in the build even when selftests are disabled, namely disasm-selftest.c and gdbarch-selftests.c. These files are entirely #if'ed out when building with selftests disabled. This is not a huge problem, but I think it would make more sense if these files were simply not built. With this patch, I propose to put all the selftests-specific source files into a SELFTESTS_SRCS Makefile variable (even selftest-arch.c, which is currently added by the configure script). gdb/ChangeLog: * Makefile.in (SUBDIR_UNITTESTS_SRCS): Rename to... (SELFTESTS_SRCS): ... this. Add disasm-selftests.c, gdbarch-selfselftests.c and selftest-arch.c. (SUBDIR_UNITTESTS_OBS): Rename to... (SELFTESTS_OBS): ... this. (COMMON_SFILES): Remove disasm-selftests.c and gdbarch-selftests.c. * configure.ac: Don't add selftest-arch.{c,o} to CONFIG_{SRCS,OBS}. * disasm-selftests.c, gdbarch-selftests.c: Remove GDB_SELF_TEST preprocessor conditions. --- gdb/Makefile.in | 9 +++++---- gdb/configure | 4 ++-- gdb/configure.ac | 4 ++-- gdb/disasm-selftests.c | 5 ----- gdb/gdbarch-selftests.c | 4 ---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 7c0a0aefbc..0e457f3ba1 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -420,7 +420,10 @@ SUBDIR_PYTHON_DEPS = SUBDIR_PYTHON_LDFLAGS = SUBDIR_PYTHON_CFLAGS = -SUBDIR_UNITTESTS_SRCS = \ +SELFTESTS_SRCS = \ + disasm-selftests.c \ + gdbarch-selftests.c \ + selftest-arch.c \ unittests/array-view-selftests.c \ unittests/child-path-selftests.c \ unittests/cli-utils-selftests.c \ @@ -454,7 +457,7 @@ SUBDIR_UNITTESTS_SRCS = \ unittests/vec-utils-selftests.c \ unittests/xml-utils-selftests.c -SUBDIR_UNITTESTS_OBS = $(patsubst %.c,%.o,$(SUBDIR_UNITTESTS_SRCS)) +SELFTESTS_OBS = $(patsubst %.c,%.o,$(SELFTESTS_SRCS)) SUBDIR_TARGET_SRCS = target/waitstatus.c SUBDIR_TARGET_OBS = $(patsubst %.c,%.o,$(SUBDIR_TARGET_SRCS)) @@ -995,7 +998,6 @@ COMMON_SFILES = \ debuginfod-support.c \ dictionary.c \ disasm.c \ - disasm-selftests.c \ dummy-frame.c \ dwarf2/abbrev.c \ dwarf2/attribute.c \ @@ -1034,7 +1036,6 @@ COMMON_SFILES = \ gdb_obstack.c \ gdb_regex.c \ gdbarch.c \ - gdbarch-selftests.c \ gdbtypes.c \ gnu-v2-abi.c \ gnu-v3-abi.c \ diff --git a/gdb/configure b/gdb/configure index a8a1419326..5c463df462 100755 --- a/gdb/configure +++ b/gdb/configure @@ -19209,8 +19209,8 @@ if $enable_unittests; then $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h - CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) selftest-arch.o" - CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) selftest-arch.c" + CONFIG_OBS="$CONFIG_OBS \$(SELFTESTS_OBS)" + CONFIG_SRCS="$CONFIG_SRCS \$(SELFTESTS_SRCS)" fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 76c396c6eb..b9dbe13232 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2124,8 +2124,8 @@ AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8", [Define to be a string naming the default host character set.]) GDB_AC_SELFTEST([ - CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) selftest-arch.o" - CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) selftest-arch.c" + CONFIG_OBS="$CONFIG_OBS \$(SELFTESTS_OBS)" + CONFIG_SRCS="$CONFIG_SRCS \$(SELFTESTS_SRCS)" ]) GDB_AC_TRANSFORM([gdb], [GDB_TRANSFORM_NAME]) diff --git a/gdb/disasm-selftests.c b/gdb/disasm-selftests.c index b63a35ab1e..a24db7f224 100644 --- a/gdb/disasm-selftests.c +++ b/gdb/disasm-selftests.c @@ -19,8 +19,6 @@ #include "defs.h" #include "disasm.h" - -#if GDB_SELF_TEST #include "gdbsupport/selftest.h" #include "selftest-arch.h" #include "gdbarch.h" @@ -208,16 +206,13 @@ memory_error_test (struct gdbarch *gdbarch) } } // namespace selftests -#endif /* GDB_SELF_TEST */ void _initialize_disasm_selftests (); void _initialize_disasm_selftests () { -#if GDB_SELF_TEST selftests::register_test_foreach_arch ("print_one_insn", selftests::print_one_insn_test); selftests::register_test_foreach_arch ("memory_error", selftests::memory_error_test); -#endif } diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c index c99a900dbf..787a3f4058 100644 --- a/gdb/gdbarch-selftests.c +++ b/gdb/gdbarch-selftests.c @@ -18,7 +18,6 @@ along with this program. If not, see . */ #include "defs.h" -#if GDB_SELF_TEST #include "gdbsupport/selftest.h" #include "selftest-arch.h" #include "inferior.h" @@ -158,14 +157,11 @@ register_to_value_test (struct gdbarch *gdbarch) } } // namespace selftests -#endif /* GDB_SELF_TEST */ void _initialize_gdbarch_selftests (); void _initialize_gdbarch_selftests () { -#if GDB_SELF_TEST selftests::register_test_foreach_arch ("register_to_value", selftests::register_to_value_test); -#endif }