From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 3C40C3858C74 for ; Sat, 4 Jun 2022 09:11:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C40C3858C74 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 78C161F94C for ; Sat, 4 Jun 2022 09:11:01 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5BE1013A8F for ; Sat, 4 Jun 2022 09:11:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OqFXFaUhm2I0ZQAAMHmgww (envelope-from ) for ; Sat, 04 Jun 2022 09:11:01 +0000 Date: Sat, 4 Jun 2022 11:10:59 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb] Name arch selftests more clearly Message-ID: <20220604091058.GA24123@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2022 09:11:08 -0000 Hi, When running some all archs selftest I get: ... $ gdb -q -batch -ex "maint selftest unpack_field_as_long" Running selftest unpack_field_as_long::A6. ... By now I know that A6 is an arc architecture, but for others that's less clear. Fix this by using unpack_field_as_long::arc::A6 instead. This then introduces redundant names like arm::arm, so try to avoid those, though I'm not entirely convinced that that's worth the trouble. This introduces the following new names: ... +Running selftest unpack_field_as_long::am33_2::am33-2. +Running selftest unpack_field_as_long::arc::A6. +Running selftest unpack_field_as_long::arc::A7. +Running selftest unpack_field_as_long::arc::EM. +Running selftest unpack_field_as_long::arc::HS. +Running selftest unpack_field_as_long::arm::ep9312. +Running selftest unpack_field_as_long::arm::iwmmxt. +Running selftest unpack_field_as_long::arm::iwmmxt2. +Running selftest unpack_field_as_long::arm::xscale. +Running selftest unpack_field_as_long::bpf::xbpf. +Running selftest unpack_field_as_long::frv::fr400. +Running selftest unpack_field_as_long::frv::fr450. +Running selftest unpack_field_as_long::frv::fr500. +Running selftest unpack_field_as_long::frv::fr550. +Running selftest unpack_field_as_long::frv::simple. +Running selftest unpack_field_as_long::frv::tomcat. +Running selftest unpack_field_as_long::iq2000::iq10. +Running selftest unpack_field_as_long::m32c::m16c. +Running selftest unpack_field_as_long::mep::c5. +Running selftest unpack_field_as_long::mep::h1. +Running selftest unpack_field_as_long::nds32::n1. +Running selftest unpack_field_as_long::nds32::n1h. +Running selftest unpack_field_as_long::nds32::n1h_v2. +Running selftest unpack_field_as_long::nds32::n1h_v3. +Running selftest unpack_field_as_long::nds32::n1h_v3m. +Running selftest unpack_field_as_long::z80::ez80-adl. +Running selftest unpack_field_as_long::z80::ez80-z80. +Running selftest unpack_field_as_long::z80::gbz80. +Running selftest unpack_field_as_long::z80::r800. +Running selftest unpack_field_as_long::z80::z180. ... Tested on x86_64-linux. Any comments? Thanks, - Tom [gdb] Name arch selftests more clearly --- gdb/selftest-arch.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c index 1fe0b2d59b4..33d7875c120 100644 --- a/gdb/selftest-arch.c +++ b/gdb/selftest-arch.c @@ -63,20 +63,37 @@ foreach_arch_test_generator (const std::string &name, if (skip_arch (arch)) continue; + struct gdbarch_info info; + info.bfd_arch_info = bfd_scan_arch (arch); + info.osabi = GDB_OSABI_NONE; + auto test_fn = ([=] () { - struct gdbarch_info info; - info.bfd_arch_info = bfd_scan_arch (arch); - info.osabi = GDB_OSABI_NONE; struct gdbarch *gdbarch = gdbarch_find_by_info (info); SELF_CHECK (gdbarch != NULL); function (gdbarch); reset (); }); - tests.emplace_back (string_printf ("%s::%s", name.c_str (), arch), - test_fn); + std::string id; + + bool has_sep = strchr (arch, ':') != nullptr; + if (has_sep) + /* Avoid avr::avr:1. */ + id = arch; + else if (strncasecmp (info.bfd_arch_info->arch_name, arch, + strlen (info.bfd_arch_info->arch_name)) == 0) + /* Avoid arm::arm. */ + id = arch; + else + /* Use arc::A6 instead of A6. This still leaves us with an unfortunate + redundant id like am33_2::am33-2, but that doesn't seem worth the + effort to avoid. */ + id = string_printf ("%s::%s", info.bfd_arch_info->arch_name, arch); + + id = string_printf ("%s::%s", name.c_str (), id.c_str ()); + tests.emplace_back (id, test_fn); } return tests; }