Mark H Weaver <m...@netris.org> writes: > Hi Marius, > > guix-comm...@gnu.org writes: > >> mbakke pushed a commit to branch master >> in repository guix. >> >> commit 2e2db09280d114bbdd0744c73d02aa5c40abdf4a >> Author: Marius Bakke <mba...@fastmail.com> >> Date: Sun Aug 4 16:22:20 2019 +0200 >> >> gnu: strace: Update to 5.2. > > This new version of strace failed to build twice in a row on my Thinkpad > X200 running the Guix system and Linux-libre 5.2.5. I've not yet made a > third attempt. strace-5.1 has always built successfully on this system. > > Specifically, strace-5.2 fails 4 of its tests on my system. See below > for the relevant entries from tests/test-suite.log.
Yay, test failures that vary based on hardware or kernel. I found this commit upstream which touches the four failing tests, though I don't really understand what it does: https://github.com/strace/strace/commit/4377e3a1535a0ec3a42da8a1366ad6943f4efa0e Mark: can you try the attached patch and see if it makes a difference? Strace (still) builds for me with this patch, at least.
From bd4ca7a67ae51c0997dc372c1f664ff4c6846631 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mba...@fastmail.com>
Date: Mon, 5 Aug 2019 19:37:26 +0200
Subject: [PATCH] gnu: strace: Fix test failure on some systems.
* gnu/packages/patches/strace-ipc-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/linux.scm (strace)[source](patches): New field.
---
gnu/local.mk | 1 +
gnu/packages/linux.scm | 1 +
gnu/packages/patches/strace-ipc-tests.patch | 30 +++++++++++++++++++++
3 files changed, 32 insertions(+)
create mode 100644 gnu/packages/patches/strace-ipc-tests.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ca15f3096d..16ef2cdfc1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1305,6 +1305,7 @@ dist_patch_DATA = \
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/sssd-curl-compat.patch \
%D%/packages/patches/steghide-fixes.patch \
+ %D%/packages/patches/strace-ipc-tests.patch \
%D%/packages/patches/streamlink-update-test.patch \
%D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \
%D%/packages/patches/superlu-dist-awpm-grid.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 44526e3786..fe703a748a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1408,6 +1408,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(method url-fetch)
(uri (string-append home-page "/files/" version
"/strace-" version ".tar.xz"))
+ (patches (search-patches "strace-ipc-tests.patch"))
(sha256
(base32
"1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"))))
diff --git a/gnu/packages/patches/strace-ipc-tests.patch b/gnu/packages/patches/strace-ipc-tests.patch
new file mode 100644
index 0000000000..49341765ca
--- /dev/null
+++ b/gnu/packages/patches/strace-ipc-tests.patch
@@ -0,0 +1,30 @@
+Fix a test failure on some systems.
+
+Taken from upstream:
+https://github.com/strace/strace/commit/4377e3a1535a0ec3a42da8a1366ad6943f4efa0e
+
+diff --git a/tests/gen_tests.in b/tests/gen_tests.in
+index 4a506b94c..4fdf4722c 100644
+--- a/tests/gen_tests.in
++++ b/tests/gen_tests.in
+@@ -168,16 +168,16 @@ ipc_msg-Xabbrev +ipc.sh -Xabbrev -a26
+ ipc_msg-Xraw +ipc.sh -Xraw -a16
+ ipc_msg-Xverbose +ipc.sh -Xverbose -a34
+ ipc_msgbuf-Xabbrev +ipc_msgbuf.test -Xabbrev
+-ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a22
++ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a20
+ ipc_msgbuf-Xverbose +ipc_msgbuf.test -Xverbose
+ ipc_sem +ipc.sh -a29
+ ipc_sem-Xabbrev +ipc.sh -Xabbrev -a29
+ ipc_sem-Xraw +ipc.sh -Xraw -a19
+ ipc_sem-Xverbose +ipc.sh -Xverbose -a36
+-ipc_shm +ipc.sh -a29
+-ipc_shm-Xabbrev +ipc.sh -Xabbrev -a29
++ipc_shm +ipc.sh -a26
++ipc_shm-Xabbrev +ipc.sh -Xabbrev -a26
+ ipc_shm-Xraw +ipc.sh -Xraw -a19
+-ipc_shm-Xverbose +ipc.sh -Xverbose -a36
++ipc_shm-Xverbose +ipc.sh -Xverbose -a34
+ kcmp -a22
+ kcmp-y -a22 -y -e trace=kcmp
+ kern_features -a16
--
2.22.0
signature.asc
Description: PGP signature
