!15 fix the testcase fail

From: @dongyuzhen 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6
This commit is contained in:
openeuler-ci-bot 2023-01-11 01:25:27 +00:00 committed by Gitee
commit 36f0a07797
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From d03a041790e1d0ecb900ec1de57580bca9519daa Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 2 Jul 2022 01:11:00 +0200
Subject: [PATCH] Redirect stder in gdb-add-index.sh test
gdb-add-index might produce an error message on stderr when trying to
disable debuginfod support. Any message to stderr makes the testcase
fail. This looks like a gdb bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=29316
But it is easy to workaround by redirecting stderr to stdout.
---
testsuite/dwz.tests/gdb-add-index.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/testsuite/dwz.tests/gdb-add-index.sh b/testsuite/dwz.tests/gdb-add-index.sh
index 5a91b23..3095efb 100644
--- a/testsuite/dwz.tests/gdb-add-index.sh
+++ b/testsuite/dwz.tests/gdb-add-index.sh
@@ -1,6 +1,8 @@
cp $execs/hello 1
-gdb-add-index 1
+# Redirect gdb-add-index stderr to stdout.
+# https://sourceware.org/bugzilla/show_bug.cgi?id=29316
+gdb-add-index 1 2>&1
readelf -S 1 | grep -q '\.gdb_index'
--
2.31.1

View File

@ -1,6 +1,6 @@
Name: dwz
Version: 0.14
Release: 4
Release: 5
Summary: A DWARF optimization and duplicate removal tool
License: GPLv2+ and GPLv3+
URL: https://sourceware.org/dwz/
@ -8,6 +8,7 @@ Source0:https://sourceware.org/ftp/dwz/releases/%{name}-%{version}.tar.xz
BuildRequires:gcc gcc-c++ gdb elfutils-libelf-devel dejagnu
Patch1: testsuite-Handle-readelf-following-links-by-default.patch
Patch2: backport-Redirect-stder-in-gdb-add-index.sh-test.patch
%description
The package contains a program that attempts to optimize DWARF debugging
@ -53,6 +54,9 @@ make check
%{_mandir}/man1/dwz*
%changelog
* Tue Jan 10 2023 dongyuzhen <dongyuzhen@h-partners.com> - 0.14-5
- fix the testcase fail
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 0.14-4
- rebuild for next release