From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 1B579393C8B2 for ; Tue, 12 May 2020 16:48:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1B579393C8B2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x431.google.com with SMTP id s8so16349172wrt.9 for ; Tue, 12 May 2020 09:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Y/KraUHLX6d91nQ3hUJou/rHpuocybLC8fAgIuM1VWk=; b=bpVwSkFImV3KNOWd2MXkzBSpM8wB6PpiohM5IJueTMTld+7+fwhcVo9BU0ma6s5uGx yimjbKwedEaexz1ml2TTZaYlZljQI0+zb167uIaM4ZpWsc6HGI1uPzSiyCnkh6eqbBYn fb878oKXPNmS07rxPR9Ztppx7o7zWV6Va5YY091pt2/kv1yh+K8QpN40C6CgbMUmNpct xRB1p0Kfdt8zH+zVGF4YV4M+SO0iE1kDjnRdHDs62XXQtc2SNhGQFefIs4TadDXhThhN wcT97PZO68+Y99k3ZLoGyRuoZ2rUUdiL+eLY3T/rFAtRYqTyk4NhnIZLhUreRtdHqUb5 rPaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Y/KraUHLX6d91nQ3hUJou/rHpuocybLC8fAgIuM1VWk=; b=mr5U2M3PrVTlHkcmHHCquaAP8wu3kXH6xWfsxskuQh2IV6xXOXEgWwXJx6rAQW2TKg dnjTWk3zwkHKDZ/+yUd50SFQ/cKNzWASjZWB8V8mdM+Neaf+z7dPTg6DmhI/OIHjPZ6d VogTJTIvERvRG83ketLCTAdDqyGJgelkvwsjAuTDLcdHh9WmweXg5OVsgVAEUZrDzJJb jL3WNmPasNCOoscYcWA6rXAn/PJ4TLQ/xwYEb30QhiIXhqTt47C3/PIwVvtyM67Q6lsU mIPNpzUuIBTyB+ZaSIUJ7boHVLlcLRMBULw2M5mBbvm7nX3OuLSD+yNTqLYCuwEjHG/q ux5Q== X-Gm-Message-State: AGi0Pubgi997UK0P6vMhcBdvDnd5KFTqVuAvn2tckPeIwBfH/Lrh5b2q pkuC5PuggO4up5wUaEoUeUFAIHiziOE= X-Google-Smtp-Source: APiQypKZwO0kMPj1toDV90bxyS/LNgUBwtAK+qzTm5Hj/5FHT5kEf65CV0ahadkXdj3wKcGr8mL6Rg== X-Received: by 2002:a5d:6448:: with SMTP id d8mr27489786wrw.118.1589302086922; Tue, 12 May 2020 09:48:06 -0700 (PDT) Received: from localhost (host81-151-181-184.range81-151.btcentralplus.com. [81.151.181.184]) by smtp.gmail.com with ESMTPSA id c193sm5822653wme.37.2020.05.12.09.48.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2020 09:48:06 -0700 (PDT) Date: Tue, 12 May 2020 17:48:05 +0100 From: Andrew Burgess To: gdb-patches@sourceware.org Subject: Re: [PATCHv3 0/3] Automatic detection of test name problems Message-ID: <20200512164805.GR3522@embecosm.com> References: <20200511213017.GQ3522@embecosm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200511213017.GQ3522@embecosm.com> X-Operating-System: Linux/5.5.17-200.fc31.x86_64 (x86_64) X-Uptime: 17:44:48 up 22 days, 5:37, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-Spam-Status: No, score=-15.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Tue, 12 May 2020 16:48:09 -0000 * Andrew Burgess [2020-05-11 22:30:17 +0100]: > * Andrew Burgess [2020-04-30 12:20:08 +0100]: > > > Changes since v2: > > > > - Now print PATH: .... or DUPLICATE: .... into the summary and log > > files when an offending test name is seen. > > > > - The dg-extract-results.* script merge these new status lines into > > the single unified file when running tests in parallel. > > > > All feedback welcome, > > I've now pushed patches #1 and #2 from this series. Patch #3 I will > post to the GCC list in order to get it merged. Then I'll back-port > to our repository after that. Apologies! I confess that I never actually tested patches #1 and #2 without patch #3 also being present. I (stupidly) assumed that any unknown count lines would just be ignored by the dg-extract-results scripts. Turns out they are not. I have now pushed the patch below as a short term bridge until the dg-extract-results script changes are merged. The patch below disables my new tests when running the gdb tests in parallel, but does allow them when running non-parallel. As soon as the dg-extract-results changes are in place I will revert this patch. Sorry for any broken test runs since I pushed my changes. Thanks, Andrew --- commit 843f4d93576eef02139f7b1b3fa1cea7b0f286f1 Author: Andrew Burgess Date: Tue May 12 17:38:17 2020 +0100 gdb/testsuite: Disable path and duplicate checks when parallel testing This commit disables the recently added checking for paths in test names, and for duplicate test names, when the gdb tests are run in parallel. When running the gdb tests in parallel the extra result count lines produced cause the dg-extract-results scripts to exit with an error. The patches for the dg-extract-results scripts have been posted to the gcc-patches mailing list here: https://gcc.gnu.org/pipermail/gcc-patches/2020-May/545562.html Once they are merged there then these changes can be merged over to binutils-gdb, and this commit can be reverted. gdb/testsuite/ChangeLog: * lib/check-test-names.exp: Disable when testing is being run in parallel. diff --git a/gdb/testsuite/lib/check-test-names.exp b/gdb/testsuite/lib/check-test-names.exp index 4c0fde6e4ea..79139adea7a 100644 --- a/gdb/testsuite/lib/check-test-names.exp +++ b/gdb/testsuite/lib/check-test-names.exp @@ -18,6 +18,26 @@ # name. When a test includes the path in its test name it is harder # to compare results between two runs of GDB from different trees. +# This is a short term hack (12-May-2020). If we are running tests in +# parallel then we need support in the contrib/dg-extract-results.* +# scripts to merge the new result types generated by this file back +# into the single unified summary file. If this support is not in +# place then the dg-extract-results script will exit with an error. +# +# The script changes need to first be merged into the gcc repository, +# then copied over to the binutils-gdb repository. The required +# changes have been posted to the gcc list here: +# +# https://gcc.gnu.org/pipermail/gcc-patches/2020-May/545562.html +# +# But until these are merged into binutils-gdb the extra checks +# offered by this file can only be done when the tests are not running +# in parallel. +if {[info exists GDB_PARALLEL]} { + # Don't load this file. + return +} + namespace eval ::CheckTestNames { # An associative array of all test names to the number of times each # name is seen. Used to detect duplicate test names.