From patchwork Thu Oct 2 16:47:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Segher Boessenkool X-Patchwork-Id: 396042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 98248140180 for ; Fri, 3 Oct 2014 02:48:06 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=D51jMc5Hi6ophkULa 742/4a7Y2ZyNEBExb9V6IQGYygsK6+kvNA68036sT6NyyGwYOyv38hCclIE95PeD htWNKybmVCmu1gns9aMJs9o9L6FfbKzmhzjFgu73uArwkfvMRa+ucPNj+YF7VNBE +1vwrPcDJzDrjiEoISS3CB7PPU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=QtB9ZlA8IcsNpsyyvCN4Elb Ulrc=; b=CQKBSKB3N1GntHmSEcHZ9HNJosWqOdS3py7Jol06LdUjtFT3XwDtluF BCmyhU1iLks4aDE9CjAP+gtcbOtsxy++xALkhU8qXkmJuJIVkDBoU6eC/1XPZlF2 /mlB7MsYn7nl60no/fD64ChiTOyB3HwyScUrXxJ0bA93Hfa9Q+wE= Received: (qmail 18506 invoked by alias); 2 Oct 2014 16:47:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 18497 invoked by uid 89); 2 Oct 2014 16:47:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: gate.crashing.org Received: from gate.crashing.org (HELO gate.crashing.org) (63.228.1.57) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 02 Oct 2014 16:47:56 +0000 Received: from gate.crashing.org (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id s92GlfoU025933; Thu, 2 Oct 2014 11:47:42 -0500 Received: (from segher@localhost) by gate.crashing.org (8.14.1/8.14.1/Submit) id s92Gle7O025929; Thu, 2 Oct 2014 11:47:40 -0500 Date: Thu, 2 Oct 2014 11:47:39 -0500 From: Segher Boessenkool To: Andrew MacLeod Cc: Jakub Jelinek , Bernd Schmidt , gcc-patches , richard.sandiford@arm.com Subject: Re: parallel check output changes? Message-ID: <20141002164739.GA25260@gate.crashing.org> References: <541AD692.4030907@redhat.com> <20140918130109.GH17454@tucnak.redhat.com> <541AD880.7080703@redhat.com> <541AF451.3070406@redhat.com> <541B1710.8060809@codesourcery.com> <20140918173609.GM17454@tucnak.redhat.com> <20140918184455.GB28595@gate.crashing.org> <20140919093723.GA26414@gate.crashing.org> <87iokel5c0.fsf@e105548-lin.cambridge.arm.com> <5422DB41.1090800@redhat.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <5422DB41.1090800@redhat.com> User-Agent: Mutt/1.4.2.3i X-IsSubscribed: yes On Wed, Sep 24, 2014 at 10:54:57AM -0400, Andrew MacLeod wrote: > Is this suppose to be resolved now? I'm still seeing some issues with a > branch cut from mainline from yesterday. Confirmed. The following patch works for me, and Andrew has tested it as well. The comment it removes isn't valid before the patch either. Okay for mainline? Segher 2014-10-02 Segher Boessenkool contrib/ * dg-extract-results.py (output_variation): Always sort if do_sum. diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index fafd38e..7db5e64 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -495,15 +495,7 @@ class Prog: key = attrgetter ('name')): sys.stdout.write ('Running ' + harness.name + ' ...\n') if self.do_sum: - # Keep the original test result order if there was only - # one segment for this harness. This is needed for - # unsorted.exp, which has unusual test names. Otherwise - # sort the tests by test filename. If there are several - # subtests for the same test filename (such as 'compilation', - # 'test for excess errors', etc.) then keep the subtests - # in the original order. - if len (harness.segments) > 1: - harness.results.sort() + harness.results.sort() for (key, line) in harness.results: sys.stdout.write (line) else: