public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/gcc-changelog-double-cherry-pick)] gcc-changelog: prevent double cherry-pick line
@ 2020-11-05 11:34 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2020-11-05 11:34 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:aa4ec769d9b423eedd02a0bfa8a8ba1b39e01870
commit aa4ec769d9b423eedd02a0bfa8a8ba1b39e01870
Author: Martin Liska <mliska@suse.cz>
Date: Thu Nov 5 12:33:25 2020 +0100
gcc-changelog: prevent double cherry-pick line
contrib/ChangeLog:
* gcc-changelog/git_commit.py: Add new check.
* gcc-changelog/test_email.py: Test it.
* gcc-changelog/test_patches.txt: Add new patch.
Diff:
---
contrib/gcc-changelog/git_commit.py | 6 +++++-
contrib/gcc-changelog/test_email.py | 4 ++++
contrib/gcc-changelog/test_patches.txt | 29 +++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 0008865338b..80ae0b2a77d 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -423,7 +423,11 @@ class GitCommit:
continue
elif line.startswith(CHERRY_PICK_PREFIX):
commit = line[len(CHERRY_PICK_PREFIX):].rstrip(')')
- self.cherry_pick_commit = commit
+ if self.cherry_pick_commit:
+ self.errors.append(Error('multiple cherry pick lines',
+ line))
+ else:
+ self.cherry_pick_commit = commit
continue
# ChangeLog name will be deduced later
diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py
index df350a41228..e38c3e52158 100755
--- a/contrib/gcc-changelog/test_email.py
+++ b/contrib/gcc-changelog/test_email.py
@@ -362,6 +362,10 @@ class TestGccChangelog(unittest.TestCase):
assert '\t2020-06-11 Martin Liska <mliska@suse.cz>' in entry
assert '\t\t Jakub Jelinek <jakub@redhat.com>' in entry
+ def test_backport_double_cherry_pick(self):
+ email = self.from_patch_glob('double-cherry-pick.patch')
+ assert email.errors[0].message.startswith('multiple cherry pick lines')
+
def test_square_and_lt_gt(self):
email = self.from_patch_glob('0001-Check-for-more-missing')
assert not email.errors
diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt
index bc9cc2e078e..37f49c851ec 100644
--- a/contrib/gcc-changelog/test_patches.txt
+++ b/contrib/gcc-changelog/test_patches.txt
@@ -3160,6 +3160,35 @@ index 823eb539993..4ec22162c12 100644
--
2.27.0
+=== double-cherry-pick.patch ===
+From e1d68582022cfa2b1dc76646724b397ba2739439 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Thu, 11 Jun 2020 09:34:41 +0200
+Subject: [PATCH] asan: fix RTX emission for ilp32
+
+gcc/ChangeLog:
+
+ PR sanitizer/95634
+ * asan.c (asan_emit_stack_protection): Fix emission for ilp32
+ by using Pmode instead of ptr_mode.
+
+Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
+(cherry picked from commit 8cff672cb9a132d3d3158c2edfc9a64b55292b80)
+(cherry picked from commit 8cff672cb9a132d3d3158c2edfc9a64b55292b80)
+---
+ gcc/asan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gcc/asan.c b/gcc/asan.c
+index 823eb539993..4ec22162c12 100644
+--- a/gcc/asan.c
++++ b/gcc/asan.c
+@@ -1 +1,2 @@
+
++
+--
+2.27.0
+
=== 0001-Check-for-more-missing-math-decls-on-vxworks.patch ===
From 0edfc1fd22405ee8e946101e44cd8edc0ee12047 Mon Sep 17 00:00:00 2001
From: Douglas B Rupp <douglas.b.rupp@gmail.com>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-05 11:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05 11:34 [gcc(refs/users/marxin/heads/gcc-changelog-double-cherry-pick)] gcc-changelog: prevent double cherry-pick line Martin Liska
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).