From e6d83a27bf32f3607abf900fcb6758080bc4f81f Mon Sep 17 00:00:00 2001
From: yixiangzhike <yixiangzhike007@163.com>
Date: Sat, 22 Oct 2022 11:17:24 +0800
Subject: [PATCH] make it easier to spot tests failures

Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
---
 ...ests-make-it-easier-to-spot-failures.patch | 75 +++++++++++++++++++
 bison.spec                                    | 12 ++-
 2 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 backport-tests-make-it-easier-to-spot-failures.patch

diff --git a/backport-tests-make-it-easier-to-spot-failures.patch b/backport-tests-make-it-easier-to-spot-failures.patch
new file mode 100644
index 0000000..9648416
--- /dev/null
+++ b/backport-tests-make-it-easier-to-spot-failures.patch
@@ -0,0 +1,75 @@
+From 4fe5a375fa6cb07f1c5cb6507b3c4e3b38e6fcef Mon Sep 17 00:00:00 2001
+From: Akim Demaille <akim.demaille@gmail.com>
+Date: Sat, 9 Oct 2021 10:29:50 +0200
+Subject: [PATCH] tests: make it easier to spot failures
+
+* examples/c/glr/c++-types.test: Split in several small test cases.
+---
+ examples/c/glr/c++-types.test | 37 ++++++++++++++++++++++++-----------
+ 1 file changed, 26 insertions(+), 11 deletions(-)
+
+diff --git a/examples/c/glr/c++-types.test b/examples/c/glr/c++-types.test
+index 074d72cc..e63dd31e 100644
+--- a/examples/c/glr/c++-types.test
++++ b/examples/c/glr/c++-types.test
+@@ -17,31 +17,46 @@
+ 
+ cat >input <<EOF
+ z + q;
++EOF
++run 0 "1.0-5: +(z, q)"
+ 
++cat >input <<EOF
+ T x;
++EOF
++run 0 "1.0-3: <declare>(T, x)"
+ 
++cat >input <<EOF
+ T x = y;
++EOF
++run 0 "1.0-7: <init-declare>(T, x, y)"
+ 
++cat >input <<EOF
+ x = y;
++EOF
++run 0 "1.0-5: =(x, y)"
+ 
++cat >input <<EOF
+ T (x) + y;
++EOF
++run 0 "1.0-9: +(<cast>(x, T), y)"
+ 
++cat >input <<EOF
+ T (x);
++EOF
++run 0 "1.0-5: <OR>(<declare>(T, x), <cast>(x, T))"
+ 
++cat >input <<EOF
+ T (y) = z + q;
++EOF
++run 0 "1.0-13: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q)))"
+ 
++cat >input <<EOF
+ T (y y) = z + q;
++EOF
++run 0 "1.0-15: <error>
++err: 1.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'"
+ 
++cat >input <<EOF
+ z + q;
+ EOF
+-run 0 "\
+-1.0-5: +(z, q)
+-3.0-3: <declare>(T, x)
+-5.0-7: <init-declare>(T, x, y)
+-7.0-5: =(x, y)
+-9.0-9: +(<cast>(x, T), y)
+-11.0-5: <OR>(<declare>(T, x), <cast>(x, T))
+-13.0-13: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q)))
+-15.0-15: <error>
+-17.0-5: +(z, q)
+-err: 15.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'"
++run 0 "1.0-5: +(z, q)"
+-- 
+2.27.0
+
diff --git a/bison.spec b/bison.spec
index 1cf3e0e..195fc54 100644
--- a/bison.spec
+++ b/bison.spec
@@ -1,11 +1,13 @@
 Name:           bison
 Version:        3.8.2
-Release:        1
+Release:        2
 Summary:        A GNU general-purpose parser generator
 License:        GPLv3+
 URL:            http://www.gnu.org/software/bison/
 Source0:        https://ftp.gnu.org/gnu/bison/bison-%{version}.tar.xz
 
+Patch1:    backport-tests-make-it-easier-to-spot-failures.patch
+
 BuildRequires:  gcc-c++ autoconf automake m4 flex
 Requires(post): info
 Requires(preun):info
@@ -38,7 +40,7 @@ Provides:       %{name}-runtime = %{version}-%{release}
 This package contains language support files and locale.
 
 %prep
-%autosetup -p1
+%autosetup -n %{name}-%{version} -p1
 
 %build
 %configure
@@ -89,6 +91,12 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/bison-gnulib.mo
 
 %changelog
+* Sat Oct 22 2022 yixiangzhike <yixiangzhike007@163.com> - 3.8.2-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:make it easier to spot tests failures
+
 * Sat Nov 27 2021 wangchen <wangchen137@huawei.com> - 3.8.2-1
 - Type:enhancement
 - ID:NA
-- 
Gitee