public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jiu Fu Guo <guojiufu@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/guojiufu/heads/personal-branch)] gcc-changelog: fix deduction for root ChangeLog Date: Wed, 10 Jun 2020 03:48:46 +0000 (GMT) [thread overview] Message-ID: <20200610034846.BA0AA395B43C@sourceware.org> (raw) https://gcc.gnu.org/g:4373fd2c7f7307f970df73a943e636b2b9d272b6 commit 4373fd2c7f7307f970df73a943e636b2b9d272b6 Author: Martin Liska <mliska@suse.cz> Date: Tue Jun 9 10:01:05 2020 +0200 gcc-changelog: fix deduction for root ChangeLog contrib/ChangeLog: * gcc-changelog/git_commit.py: Fix ChangeLog regex in order to match the top-level ChangeLog. * gcc-changelog/test_email.py: Add test. * gcc-changelog/test_patches.txt: Likewise. Diff: --- contrib/gcc-changelog/git_commit.py | 5 ++- contrib/gcc-changelog/test_email.py | 5 +++ contrib/gcc-changelog/test_patches.txt | 68 ++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 069900d7cbf..f85d4c83c63 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -150,7 +150,7 @@ misc_files = [ author_line_regex = \ re.compile(r'^(?P<datetime>\d{4}-\d{2}-\d{2})\ {2}(?P<name>.* <.*>)') additional_author_regex = re.compile(r'^\t(?P<spaces>\ *)?(?P<name>.* <.*>)') -changelog_regex = re.compile(r'^(?:[fF]or +)?([a-z0-9+-/]*)/ChangeLog:?') +changelog_regex = re.compile(r'^(?:[fF]or +)?([a-z0-9+-/]*)ChangeLog:?') pr_regex = re.compile(r'\tPR (?P<component>[a-z+-]+\/)?([0-9]+)$') dr_regex = re.compile(r'\tDR ([0-9]+)$') star_prefix_regex = re.compile(r'\t\*(?P<spaces>\ *)(?P<content>.*)') @@ -359,7 +359,8 @@ class GitCommit: % LINE_LIMIT, line)) m = changelog_regex.match(line) if m: - last_entry = ChangeLogEntry(m.group(1), self.top_level_authors, + last_entry = ChangeLogEntry(m.group(1).rstrip('/'), + self.top_level_authors, self.top_level_prs) self.changelog_entries.append(last_entry) elif self.find_changelog_location(line): diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 7e8140c915f..04ddad3f100 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -331,3 +331,8 @@ class TestGccChangelog(unittest.TestCase): assert len(email.errors) == 1 msg = 'changed file not mentioned in a ChangeLog' assert email.errors[0].message == msg + + def test_not_deduce(self): + email = self.from_patch_glob('0001-configure.patch') + assert not email.errors + assert len(email.changelog_entries) == 2 diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt index 5d9b62d2637..15fe0df1ccc 100644 --- a/contrib/gcc-changelog/test_patches.txt +++ b/contrib/gcc-changelog/test_patches.txt @@ -3058,4 +3058,72 @@ index 967e5f5f348..95d21b5bf9f 100644 + -- 2.25.4 +=== 0001-configure.patch === +From dbe341cf6a77bb28c5fdf8b32dcb0ff1c2a27348 Mon Sep 17 00:00:00 2001 +From: Martin Liska <mliska@suse.cz> +Date: Tue, 9 Jun 2020 09:39:36 +0200 +Subject: [PATCH] c++: Fix --disable-bootstrap with older g++. + +Previously I had AX_CXX_COMPILE_STDCXX in the gcc directory configure, which +added -std=c++11 to CXX if needed, but then CXX is overridden from the +toplevel directory, so it didn't have the desired effect. Fixed by moving +the check to the toplevel. Currently it is only used when building GCC +without bootstrapping; other packages that share the toplevel directory +can adjust the condition if they also want to require C++11 support. +ChangeLog: + + * configure.ac: Check AX_CXX_COMPILE_STDCXX if not bootstrapping. + * configure: Regenerate. + +gcc/ChangeLog: + + * aclocal.m4: Remove ax_cxx_compile_stdcxx.m4. + * configure.ac: Remove AX_CXX_COMPILE_STDCXX. + * configure: Regenerate. + +--- + configure | 999 ++++++++++++++++++++++++++++++++++++++++++++++- + configure.ac | 6 +- + gcc/aclocal.m4 | 1 - + gcc/configure | 997 +--------------------------------------------- + gcc/configure.ac | 2 - + 5 files changed, 1004 insertions(+), 1001 deletions(-) + +diff --git a/configure b/configure +index b7897446c70..a0c5aca9e8d 100755 +--- a/configure ++++ b/configure +@@ -1 +1,2 @@ + ++ +diff --git a/configure.ac b/configure.ac +index 59bd92a3e53..1a53ed418e4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 +index e93c1535063..1737d59d1cb 100644 +--- a/gcc/aclocal.m4 ++++ b/gcc/aclocal.m4 +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/configure b/gcc/configure +index 46850710424..629c7c7e153 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 60d83c30771..9e7efd13ecc 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1 +1,2 @@ + ++ +-- +2.26.2
reply other threads:[~2020-06-10 3:48 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200610034846.BA0AA395B43C@sourceware.org \ --to=guojiufu@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).