aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/strace-ipc-tests.patch
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-08-13 20:42:06 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-08-13 20:42:06 +0200
commit462ad9f56b9665b8d22960acee73ad91f1052c9c (patch)
tree814be463d6d0517e7db9b9e6f15dbc7516955674 /gnu/packages/patches/strace-ipc-tests.patch
parent7f5f61ae99321a7a6e08b0100cd428e11ce6a837 (diff)
parent1b1b006afd31c5526f34d157baef492c7dde2e9c (diff)
downloadguix-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar
guix-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/strace-ipc-tests.patch')
-rw-r--r--gnu/packages/patches/strace-ipc-tests.patch30
1 files changed, 30 insertions, 0 deletions
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