From 00e3c36e210aa309454188d62db0b34899058ae9 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Mon, 24 Jan 2022 10:34:33 +0100
Subject: [PATCH] Re-fix #460153 using upstream patch PR53427

---
 dejagnu.spec     |  6 +++++-
 rhbz460153.patch | 31 ++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dejagnu.spec b/dejagnu.spec
index fd35ff7..308e433 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: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -61,6 +61,10 @@ install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 %{_infodir}/dejagnu*
 
 %changelog
+* Mon Jan 24 2022 Martin Cermak <mcermak@redhat.com> - 1:1.6.3-4
+- Re-fix #460153 using patch from upstream PR53427
+  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=53427
+
 * Thu Jan 20 2022 Martin Cermak <mcermak@redhat.com> - 1:1.6.3-3
 - Fix "perror should not errcnt across test files" (#460153)
 
diff --git a/rhbz460153.patch b/rhbz460153.patch
index c2ef7db..a85b542 100644
--- a/rhbz460153.patch
+++ b/rhbz460153.patch
@@ -1,14 +1,31 @@
 diff --git a/runtest.exp b/runtest.exp
-index 01abaf1..5efa789 100644
+index 01abaf1..55462fe 100644
 --- a/runtest.exp
 +++ b/runtest.exp
-@@ -1601,8 +1601,7 @@ proc runtest { test_file_name } {
-     global testdir
- 
+@@ -741,7 +741,7 @@ if { [file tail $srcdir] eq "testsuite" } {
+     set testsuitedir $base_dir
+     set testbuilddir $base_dir
+ } else {
+-    if { $testsuitedir eq "testsuite" && $srcdir eq "." && $objdir eq "." } {
++    if { $testsuitedir eq "testsuite" && $testbuilddir eq "testsuite" } {
+ 	# Broken legacy case -- testsuite not actually in testsuite/
+ 	# Produce a warning, but continue.
+ 	send_error "WARNING: testsuite is not in a testsuite/ directory.\n"
+@@ -1594,7 +1594,7 @@ proc runtest { test_file_name } {
+     global prms_id
+     global bug_id
+     global test_result
+-    global errcnt
++    global errcnt warncnt
+     global errorCode
+     global errorInfo
+     global tool
+@@ -1603,6 +1603,8 @@ proc runtest { test_file_name } {
      clone_output "Running $test_file_name ..."
--    set prms_id	0
--    set bug_id	0
-+    reset_vars
+     set prms_id	0
+     set bug_id	0
++    set errcnt  0
++    set warncnt 0
      set test_result ""
  
      # set testdir so testsuite file -test has a starting point