Accepting request 748802 from Base:System

- disable-tests-with-ptrace.patch: Remove, set XFAIL_TESTS instead
- dwelf_elf_e_machine_string.patch: Avoid spurious failure (forwarded request 748720 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/748802
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/elfutils?expand=0&rev=77

disable-tests-with-ptrace.patch

@@ -1,43 +0,0 @@
-qemu-linux-user does not support ptrace, disable tests that depend on it
-/proc/self/auxv is not properly abstracted away
-
-Index: elfutils-0.171/tests/Makefile.am
-===================================================================
---- elfutils-0.171.orig/tests/Makefile.am
-+++ elfutils-0.171/tests/Makefile.am
-@@ -102,7 +102,7 @@ TESTS = run-arextract.sh run-arsymtest.s
- 	run-native-test.sh run-bug1-test.sh \
- 	run-debuglink.sh run-debugaltlink.sh run-buildid.sh \
- 	dwfl-bug-addr-overflow run-addrname-test.sh \
--	dwfl-bug-fd-leak dwfl-bug-report \
-+	dwfl-bug-report \
- 	run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
- 	run-disasm-x86.sh run-disasm-x86-64.sh \
- 	run-early-offscn.sh run-dwarf-getmacros.sh run-dwarf-ranges.sh \
-@@ -134,8 +134,8 @@ TESTS = run-arextract.sh run-arsymtest.s
- 	run-readelf-types.sh \
- 	run-readelf-dwz-multi.sh run-allfcts-multi.sh run-deleted.sh \
- 	run-linkmap-cut.sh run-aggregate-size.sh run-peel-type.sh \
--	vdsosyms run-readelf-A.sh \
--	run-getsrc-die.sh run-strptr.sh newdata elfstrtab dwfl-proc-attach \
-+	run-readelf-A.sh \
-+	run-getsrc-die.sh run-strptr.sh newdata elfstrtab \
- 	elfshphehdr run-lfs-symbols.sh run-dwelfgnucompressed.sh \
- 	run-elfgetchdr.sh \
- 	run-elfgetzdata.sh run-elfputzdata.sh run-zstrptr.sh \
-Index: elfutils-0.171/tests/backtrace-subr.sh
-===================================================================
---- elfutils-0.171.orig/tests/backtrace-subr.sh
-+++ elfutils-0.171/tests/backtrace-subr.sh
-@@ -106,6 +106,11 @@ check_native_unsupported()
-       fi
-     ;;
-   esac
-+
-+  if egrep 'qemu: Unsupported syscall' $err; then
-+    echo >&2 $testname: qemu-linux-user does not support ptrace
-+    exit 77
-+  fi
- }
- 
- check_core()

dwelf_elf_e_machine_string.patch

@@ -0,0 +1,12 @@
+Index: elfutils-0.177/tests/dwelf_elf_e_machine_string.c
+===================================================================
+--- elfutils-0.177.orig/tests/dwelf_elf_e_machine_string.c
++++ elfutils-0.177/tests/dwelf_elf_e_machine_string.c
+@@ -40,6 +40,7 @@ main (int argc, char **argv)
+       int em;
+       const char *machine;
+ 
++      errno = 0;
+       if (strncmp ("0x", argv[i], 2) == 0)
+ 	val = strtol (&argv[i][2], NULL, 16);
+       else

elfutils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 14 15:19:43 UTC 2019 - Andreas Schwab <schwab@suse.de>
+
+- disable-tests-with-ptrace.patch: Remove, set XFAIL_TESTS instead
+- dwelf_elf_e_machine_string.patch: Avoid spurious failure
+
 -------------------------------------------------------------------
 Tue Aug 27 07:44:02 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

elfutils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package elfutils
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@ Source1:        README-BEFORE-ADDING-PATCHES
 Source2:        baselibs.conf
 Source3:        %{name}.changes
 Source5:        %{name}.keyring
-Patch1:         disable-tests-with-ptrace.patch
+Patch1:         dwelf_elf_e_machine_string.patch
 Patch2:         cfi-fix.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -131,10 +131,7 @@ applications that require libdw.
 
 %prep
 %setup -q
-%if 0%{?qemu_user_space_build}
-# qemu does not support ptrace
 %patch1 -p1
-%endif
 %patch2 -p1
 
 %build
@@ -181,6 +178,10 @@ ls -lR %{buildroot}/%{_libdir}/libelf*
 %postun -n libdw1 -p /sbin/ldconfig
 
 %check
+%if 0%{?qemu_user_space_build}
+# qemu-linux-user does not support ptrace and a few other process details
+export XFAIL_TESTS="dwfl-proc-attach run-backtrace-dwarf.sh run-backtrace-native.sh run-deleted.sh"
+%endif
 %make_build check
 
 %files