From patchwork Thu Oct 3 14:32:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 1171222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-510144-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="fW6ts+H6"; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.b="Apaz3lW7"; dkim-atps=neutral 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 46kb8L0jdWz9sN1 for ; Fri, 4 Oct 2019 00:33:05 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=JIgXO1ieXUEP mPfuBEMG3dA3eCtsWH9h6yYzj/aACCAn1LGpO+JQdU6/MNRPEL+cfL2aUQ6v43Y0 4noUt/gBx9a+ZCKMgNyKfqgxJ9W12qa45uv2N2YUZ7+VthrHDEdRVdTv547xHdHN Zx/yYhiBCOPL3oC2noVbiLaFxzw7GtQ= 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:from :to:cc:subject:date:message-id; s=default; bh=z17pShUEUU16kjgLtQ Wtp1iQK+Q=; b=fW6ts+H6Wk3IxHkh2CNxIgstT0endQY4J5HYKFexX2Ib1FK61b yx270LOpq3+Gx10C5HF8rngDZTw8LKPs7Q9eJr7wB2Q8lUdi9l79zu4jvC9thc4D WMlWHogQCqHqroWhYrQTv33yBcFXnzpFJOK722hSnSD3XZzsvwUfIW1Y4= Received: (qmail 36985 invoked by alias); 3 Oct 2019 14:32:44 -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 36927 invoked by uid 89); 3 Oct 2019 14:32:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=maintains X-HELO: mail-wr1-f66.google.com Received: from mail-wr1-f66.google.com (HELO mail-wr1-f66.google.com) (209.85.221.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 Oct 2019 14:32:41 +0000 Received: by mail-wr1-f66.google.com with SMTP id v8so3123163wrt.2 for ; Thu, 03 Oct 2019 07:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id; bh=IMS4JP1c+9M8G+Kvy9tHJmnxnlZHdgjsRxY4+BRnv4Q=; b=Apaz3lW7/hLYZpJLCB5leeYdvqvonuF0VIW39pncfs1bGxLxMhoBKCDYKDev4Y+izV Cf6WPTp8pYw6hbSyAsh5leddtPwswuBGAUa7RUVkCB3fTYD6s2d7/GLBnOFHArRw//nt iet0jtNjP8lbJfwuSLat0kzUepUdpYHyva39zmwLKHtH1Zr0WVzbWv2758GJQQ/paSvM +RU62caXRVxbBGUzk1QF/bH4X5uQBe5yI6wvMEPx0sRGU7iZM9HDSDTfOUBFhmYipJkY m3R3c6ZUZSm8IaPb136NRQ7zvOdVZgVz0ctKX/gu5pAgdikQ5aOwloWsy5YitBYwIFhK uo7A== Received: from localhost (host86-128-12-122.range86-128.btcentralplus.com. [86.128.12.122]) by smtp.gmail.com with ESMTPSA id r2sm2183438wrm.3.2019.10.03.07.32.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Oct 2019 07:32:38 -0700 (PDT) From: Andrew Burgess To: gcc-patches@gcc.gnu.org Cc: Andrew Burgess Subject: [PATCH] contrib: Add KPASS support to dg-extract-results.{sh,py} Date: Thu, 3 Oct 2019 15:32:37 +0100 Message-Id: <20191003143237.19386-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes My motivation for the patch below comes from GDB. The binutils-gdb project maintains a copy of the contrib directory that it keeps in sync with upstream GCC, and patches to contrib/ are ideally first applied to GCC then backported to binutils-gdb. This patch extends the dg-extract-results.* scripts to support KPASS results. These results are a part of standard dejagnu. I haven't checked if this is going to impact GCC, but if it does, it should only be a good impact - adding previously missing results into the final .sum file. I tested on GDB and we now pick up some previously missing results. Will this be OK to apply? Thanks, Andrew --- Extend dg-extract-results.sh and dg-extract-results.py to support the KPASS test result status. This is required by GDB which uses a copy of the dg-extract-results.{sh,py} scripts that it tries to keep in sync with GCC. ChangeLog: * contrib/dg-extract-results.sh: Add support for KPASS. * contrib/dg-extract-results.py: Likewise. --- ChangeLog | 5 +++++ contrib/dg-extract-results.py | 2 +- contrib/dg-extract-results.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 4e113a8dd6b..7100794d42a 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -117,7 +117,7 @@ class Prog: 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' - r'|KFAIL):\s*(.+)') + r'|KFAIL|KPASS):\s*(.+)') self.completed_re = re.compile (r'.* completed at (.*)') # Pieces of text to write at the head of the output. # start_line is a pair in which the first element is a datetime diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 97ac222b54a..f948088370e 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -326,7 +326,7 @@ BEGIN { } } /^\t\t=== .* ===$/ { curvar = ""; next } -/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ { +/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL|KPASS):/ { testname=\$2 # Ugly hack for gfortran.dg/dg.exp if ("$TOOL" == "gfortran" && testname ~ /^gfortran.dg\/g77\//)