From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103127 invoked by alias); 13 Aug 2019 07:51:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 103045 invoked by uid 89); 13 Aug 2019 07:51:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Aug 2019 07:51:41 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 648DDAE50 for ; Tue, 13 Aug 2019 07:51:39 +0000 (UTC) Resent-From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Resent-To: GCC Patches Resent-Date: Tue, 13 Aug 2019 09:51:38 +0200 Resent-Message-ID: <9d7cb687-7a70-7adb-cd2c-f2370f33c31d@suse.cz> Message-Id: <5b1ca9c4313d2424a2e4a85c7d5bfa28697d26e4.1565682592.git.mliska@suse.cz> In-Reply-To: References: From: Martin Liska Date: Tue, 13 Aug 2019 07:57:00 -0000 Subject: [PATCH 2/3] mklog: parse PR references from new test files To: gcc-patches@gcc.gnu.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.22.0" X-IsSubscribed: yes X-SW-Source: 2019-08/txt/msg00799.txt.bz2 This is a multi-part message in MIME format. --------------2.22.0 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit Content-length: 223 contrib/ChangeLog: 2019-08-13 Martin Liska * mklog: Parse PR references from newly added test files. --- contrib/mklog | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) --------------2.22.0 Content-Type: text/x-patch; name="0002-mklog-parse-PR-references-from-new-test-files.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-mklog-parse-PR-references-from-new-test-files.patch" Content-length: 1839 diff --git a/contrib/mklog b/contrib/mklog index e7a513fad5c..85242002357 100755 --- a/contrib/mklog +++ b/contrib/mklog @@ -40,6 +40,8 @@ from subprocess import Popen, PIPE me = os.path.basename(sys.argv[0]) +pr_regex = re.compile('\+(\/(\/|\*)|[Cc*!])\s+(PR [a-z+-]+\/[0-9]+)') + def error(msg): sys.stderr.write("%s: error: %s\n" % (me, msg)) sys.exit(1) @@ -299,7 +301,7 @@ def parse_patch(contents): if l != r: break comps.append(l) - + if not comps: error("failed to extract common name for %s and %s" % (left, right)) @@ -338,6 +340,14 @@ def parse_patch(contents): return diffs + +def get_pr_from_testcase(line): + r = pr_regex.search(line) + if r != None: + return r.group(3) + else: + return None + def main(): name, email = read_user_info() @@ -372,6 +382,7 @@ otherwise writes to stdout.' # Generate template ChangeLog. logs = {} + prs = [] for d in diffs: log_name = d.clname @@ -387,6 +398,9 @@ otherwise writes to stdout.' if hunk0.is_file_addition(): if re.search(r'testsuite.*(? -%s\n""" % (log_name, date, name, email, msg)) +%s%s\n""" % (log_name, date, name, email, bugmsg, msg)) if args.inline: # Append patch body --------------2.22.0--