From 75e1534e800a9e1d68f27db92b6cbb6e7ecc2e6c Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Thu, 20 Jan 2022 09:48:25 +0100
Subject: [PATCH] Fix rhbz460153

---
 dejagnu.spec     |  8 +++++++-
 rhbz460153.patch | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 rhbz460153.patch

diff --git a/dejagnu.spec b/dejagnu.spec
index 6781c4a..fd35ff7 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -13,6 +13,8 @@ BuildRequires:  gcc-c++
 BuildRequires: expect texinfo
 BuildRequires: make
 
+Patch0: rhbz460153.patch
+
 %description
 DejaGnu is an Expect/Tcl based framework for testing other programs.
 DejaGnu has several purposes: to make it easy to write tests for any
@@ -23,6 +25,7 @@ into software development).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure -v
@@ -58,6 +61,9 @@ install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 %{_infodir}/dejagnu*
 
 %changelog
+* Thu Jan 20 2022 Martin Cermak <mcermak@redhat.com> - 1:1.6.3-3
+- Fix "perror should not errcnt across test files" (#460153)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/rhbz460153.patch b/rhbz460153.patch
new file mode 100644
index 0000000..c2ef7db
--- /dev/null
+++ b/rhbz460153.patch
@@ -0,0 +1,14 @@
+diff --git a/runtest.exp b/runtest.exp
+index 01abaf1..5efa789 100644
+--- a/runtest.exp
++++ b/runtest.exp
+@@ -1601,8 +1601,7 @@ proc runtest { test_file_name } {
+     global testdir
+ 
+     clone_output "Running $test_file_name ..."
+-    set prms_id	0
+-    set bug_id	0
++    reset_vars
+     set test_result ""
+ 
+     # set testdir so testsuite file -test has a starting point