From patchwork Thu Sep 14 14:24:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Iannetta X-Patchwork-Id: 139616 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp386594vqi; Thu, 14 Sep 2023 07:25:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYTZxwWcaJaBU0bJF+ECjIcnUGeEqiTdYWOBo4wD8KSq3f92p6jJmwCTKYxJJfl95EQYR8 X-Received: by 2002:a50:ed13:0:b0:527:fa8d:d3ff with SMTP id j19-20020a50ed13000000b00527fa8dd3ffmr5034055eds.6.1694701527270; Thu, 14 Sep 2023 07:25:27 -0700 (PDT) Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i4-20020aa7dd04000000b0052a3c4c5be4si1490290edv.48.2023.09.14.07.25.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 07:25:27 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Q2xN6CM1; arc=fail (signature failed); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B9BBE3857700 for ; Thu, 14 Sep 2023 14:25:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9BBE3857700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694701525; bh=HHW3HSsrkmJK3ahylvXzdesNJheEFBSdB5Dxti43TWM=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Q2xN6CM1Bt0u4u3kCyvnmtPLvpO+/l57aOSrI8vaRPsUrpLHa4MNTrda6V87IPOKe HGrhg/u8HEaOKt2awxt5fLBcNQ6S0+sBKGRnO/DI/+UnambQRMGnmEIrbyVf7AsTym qKdjKPx+rP9q19654bmHSIbZ3OA/dGSJ8BV7waRM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mxout.security-mail.net (mxout.security-mail.net [85.31.212.43]) by sourceware.org (Postfix) with ESMTPS id CD0F83858C5F for ; Thu, 14 Sep 2023 14:24:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD0F83858C5F Received: from localhost (fx303.security-mail.net [127.0.0.1]) by fx303.security-mail.net (Postfix) with ESMTP id B08BB30ED4A for ; Thu, 14 Sep 2023 16:24:37 +0200 (CEST) Received: from fx303 (fx303.security-mail.net [127.0.0.1]) by fx303.security-mail.net (Postfix) with ESMTP id 7CAC630EEA0; Thu, 14 Sep 2023 16:24:37 +0200 (CEST) Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01lp0108.outbound.protection.outlook.com [104.47.24.108]) by fx303.security-mail.net (Postfix) with ESMTPS id 1A23A30ED4A; Thu, 14 Sep 2023 16:24:36 +0200 (CEST) Received: from MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:33::22) by MR1P264MB1825.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:12::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.20; Thu, 14 Sep 2023 14:24:34 +0000 Received: from MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM ([fe80::aeb6:2f26:45ff:5461]) by MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM ([fe80::aeb6:2f26:45ff:5461%7]) with mapi id 15.20.6792.020; Thu, 14 Sep 2023 14:24:34 +0000 X-Virus-Scanned: E-securemail Secumail-id: <13fda.650317a4.191aa.0> ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ipjZso+Jh8P3T34RYwT6b6v1JE2xKJvfwixw2tALRu/+hoJ6mYoGWJRFk9YDj56lxg3rLrsIJGCUFkYJ7owKc9GbPbp6WNOqlkA84aZ9wB2JSqDQRrR+oOeTmtkYIWgZq9qhBq9y/qFKNE178Z9bQMnkMUqnXV1rXGpAt7Bbn4jOL3eknaiP8Sj6zaiXv84YW3h1eliWk8hXrjBV5RF13n2uFur+L3xEDaZUInF73wqWR4ZIF6pwtJX7iZ/6kMZ8r6A6y3y/gipmhTAdN52Vnu1lTSdL3cAb63hCp12FjJGblv4e+GNXsSo6XYDvItaQOXwkc5XnJJuyN/cep334hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HHW3HSsrkmJK3ahylvXzdesNJheEFBSdB5Dxti43TWM=; b=eAi4xLSo+Ci8cfBw/N3DCghBO9Zol/3vA3w+otDtFxRLgdcfY0/IDOuiXE/59Q8zleRCqwb5VVCPrduMA8ogSRJ5YDbK0B6yt33Y4A6uNy3KKS7KMOfW6kj5XOH0MnG3VvuCaDZ+yreX5mBjdEOxp5LO5M+XoeeABFvRtBtGS9c8RYmwOq39mHQt9fCHU89adtht11jJr0U1LTMxCnDXe4hLDSZjLGuB1NJN9aqacL6xp4SzAfqTwsxko2B+w6hs0yh40PD1nR5mjjTnyOqBQrtZibAwOXG3gmpyVjdIcNtycd58WVqCLpiHPHnWCm1iqmuDw/4c6Tw2K+q3ozN4zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kalrayinc.com; dmarc=pass action=none header.from=kalrayinc.com; dkim=pass header.d=kalrayinc.com; arc=none Date: Thu, 14 Sep 2023 16:24:33 +0200 To: gcc-patches@gcc.gnu.org Cc: rdsandiford@googlemail.com Subject: [PATCH] Harmonize headers between both dg-extract-results scripts Message-ID: <20230914142433.fifbjzmb6iu3yoqk@ws2202.lin.mbt.kalray.eu> Content-Disposition: inline User-Agent: NeoMutt/20171215 X-ClientProxiedBy: LO4P265CA0264.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:37c::15) To MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:33::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2482:EE_|MR1P264MB1825:EE_ X-MS-Office365-Filtering-Correlation-Id: e08cc384-4388-4219-7f21-08dbb52e51a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /JUkLzRYrG2l53NUGIEtZ87TVQlr4tBMhQHuNq/oXDWeBnJB9h+r7A+cLxiQUWIPGFtRmy9vw/+6sYB2uVrdeaW+8GZQFkZc2Q1nZ8vLBlGixYD8t2V8P7XznPt2mH1dYoeG+rfWJKcZM9wnrMk+AerFZLc+cB63+UTBJvUNx+/PBNN7Y7hD/2wn+2uYA0qbG9dEO28R4hW0lq8R9eDiOdpSRikAh7wzfIseJBph7hMvKKDoRrtmIw0JuFxdW+aIq+Ptn8Fnwg+HLM3u3a28kIO+KCywIg7Eoh7h/e6JadAu+KO2jMBzZhcGEBnbNyh+j2uDbo07n9RNTneJcR3wTeEG7/mJZjKGa6q9d1fPk7Gva+iYwK6TdEjCp2ECBB4u63w1p1aOAvgCP8BxaplmWbe9rxBlcYQ94rw5sl3yDzw0woBVtErbkCyRYiOIapU056b1y/dIBYPEGW1qkaxKEibQlMf0NpRZNEwytDqS8eQHNGmbMPye3YRS/f8UJ2iN1zqeOJsUT5DlKb6G8s3onpHMQF7Sj9hJdy/KNiWEgc+ZkAL8RIuhtJXJHSryIStZ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376002)(39860400002)(366004)(136003)(396003)(346002)(1800799009)(451199024)(186009)(83380400001)(9686003)(6512007)(8676002)(4326008)(66946007)(2906002)(316002)(6916009)(5660300002)(41300700001)(66556008)(8936002)(66476007)(6486002)(478600001)(38100700002)(86362001)(26005)(1076003)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8x7n+ca4cv9VFUODiUJfs/OSWaVbR9QrUozsiFG/zFlDM5VHD5LeolkwEVPi6IZPCZhO4fzW0WhGOE0rLRn+m3RZ6jTuLl/xvVRtATQQLuloldd1v2D87Ex/Sg397Puaz6sg+SCHEd3+rLFK77PsEsfTXs/lEruoDURiDLqNWz8BckvYZf5cN8aYdjdjVzBicgTyP2Dt/1xhJUkK/S8Dt891yQWPTdLZxJ/VARM0lcZh7EeprRjDGm9ikNFBRnREgfGkzKQygji6N+vGwz/UHCTb5cnZriMgBsC/K4BMFQU29i1Lmv7S5vamqILz5mkbqMHc7Gk70a84cesVs7pC5NL8KuE9yFNLndTGoVpLvFvyn339g1evYWtFKIsURbXpbqpkReFtqMib5B2FvFff6i/YaVl1U3M2hWsKddhLQ3ztssVRgn1r+ArPRjSAk9KaFRlcDn/UiA/CALDDwUvVu4te9wdZfRdr4PdGjO8aU0eILLw6S95r5daGVT2yxr5QVvBM3CY4z4xbNtNgcrv9oMZOdLPgg8AndPxEkhiejzYtue+N99+47MrPRVKd5fTdZ8mkMT0HKyhYv3/GOktppXAymd4rw6oFfsWhTpR259GpjKeqHQC0oDI/ks6iuwCfccA+jDoYAN+mOR0m2uaNNlD1Y0ddSiDmaLdBNqrLfX1645CbiFe34TIg8ZLUEa+9v9MwON6+pIH5vXKgPKXepX61sWTHmUKoQadxMBDEeXP2lxk4UCLVXSIuWLg4hMjj9+nyGPGk1WokXjlrvmUShepTS3JPkhjy+35Iu7BhnKqQW3nabGzZw8jiZmafxzS5QOQwv2EUZjhlN1VPqJ7QwtlzNiqmFaCOAgs1Lj/MeeXbyJ+2qPAF0UBJ7I9AhjEFo4U8xHI1zXh75p5GcI5Ud1ann5AKKl/U16NtkyS5EpeBhTceCTwMhrtkthYIfSMb 9J190n2YyRx2KqKjnhY6z0zdDHIvf4BrTbEqR1cjq00o3nGB+IzUWxcWM9nNQF16SMOWSW0m6I0WVCq6c18nQF1f6Hqf/OgeVUQagDZ3TLcjKLmFI5gZVcWKocnrspvNEhM88ZjXeiFzi9El9FJHHaC5RQZfsU5zLtyRihDQslLjmblU4mt8S2vLIuBLGXOP3KyaFr8rTYY53eGc8Neb935mtxTfJtBxIUukhgNjI2y5X7jPJ20Sx5xZLG55Eg9QkRbdLFFoidvHBr0tnDSyijVWlQSj8AnPh+SCNAJfkmJn1PWx475HUK5hNcpzDHFiY0P/3283X/DzmJ6viGvJiuhqTylhB9EVjUnQIYbOQVCgcoBfonPHkmI0sWYQXG1GFv+6NyafYjMhCw7ofmy8O2ZgxAgJxovJ8x8kc/iV0vv60jmIWLYPYa598KyqKRB9FSMbs0rGNRiDVKhtOdruM6hQ7AMvCbWn9v04+IQzGrfjddPs0wqpg0xMrDzNrib1gQWDIUNcFEGEPTw0E0IT1ipQMoOWfy4LlrCc8Gpx5/T0aKXxTRnIJUJ0BNbZlpe2YrIjsW32zQh9ddGOzzhK2Zhcy9jEPwzmIjxeiK95k7zerchuN7WyQp+FykzRyeuiQ+xH51/YyBswSrOmbRnp8A== X-OriginatorOrg: kalrayinc.com X-MS-Exchange-CrossTenant-Network-Message-Id: e08cc384-4388-4219-7f21-08dbb52e51a1 X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 14:24:34.7258 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8931925d-7620-4a64-b7fe-20afd86363d3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VuFgXRnIaJD5dtr1ubPgLy8xt4kRQrDKbSf85BkbTtcDwhzM0WGv5FlfcThtNMvCh5uZxYicGYllFP+xev6Kng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB1825 X-ALTERMIMEV2_out: done X-Spam-Status: No, score=-11.4 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 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Paul Iannetta via Gcc-patches From: Paul Iannetta Reply-To: Paul Iannetta Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777023348514867601 X-GMAIL-MSGID: 1777023348514867601 Hi, This is a small patch so that both dg-extract-results.py and dg-extract-results.sh share the same header. In particular, it fixes the fact that the regexp r'^Test Run By (\S+) on (.*)$' was never matched in the python file. Thanks, --- Paul Kalray Author: Paul Iannetta Date: Thu Sep 14 15:43:58 2023 +0200 Harmonize headers between both dg-extract-results scripts The header of the python version looked like: Target is ... Host is ... The header of the bash version looked like: Test run by ... on ... Target is ... After this change both headers look like: Test run by ... on ... Target is ... Host is ... The order of the tests is not the same but since dg-cmp-results.sh it does not matter much. contrib/ChangeLog: 2023-09-14 Paul Iannetta * dg-extract-results.py: Print the "Test run" line. * dg-extract-results.sh: Print the "Host" line. diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 30aa68771d4..34da1808c5f 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -113,7 +113,7 @@ class Prog: # Whether to create .sum rather than .log output. self.do_sum = True # Regexps used while parsing. - self.test_run_re = re.compile (r'^Test Run By (\S+) on (.*)$') + self.test_run_re = re.compile (r'^Test run by (\S+) on (.*)$') self.tool_re = re.compile (r'^\t\t=== (.*) tests ===$') self.result_re = re.compile (r'^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED' r'|WARNING|ERROR|UNSUPPORTED|UNTESTED' diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index ff6c50d029c..57f6fe0e997 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -271,7 +271,7 @@ cat $SUM_FILES \ # Write the begining of the combined summary file. -head -n 2 $FIRST_SUM +head -n 3 $FIRST_SUM echo echo " === $TOOL tests ===" echo