* Re: 04/07: gnu: strace: Update to 5.2. [not found] ` <20190804160224.A29E4209DE@vcs0.savannah.gnu.org> @ 2019-08-05 16:31 ` Mark H Weaver 2019-08-05 17:39 ` Marius Bakke 2019-08-05 20:03 ` Tobias Geerinckx-Rice 0 siblings, 2 replies; 5+ messages in thread From: Mark H Weaver @ 2019-08-05 16:31 UTC (permalink / raw) To: Marius Bakke; +Cc: guix-devel Hi Marius, guix-commits@gnu.org writes: > mbakke pushed a commit to branch master > in repository guix. > > commit 2e2db09280d114bbdd0744c73d02aa5c40abdf4a > Author: Marius Bakke <mbakke@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. Mark --8<---------------cut here---------------start------------->8--- FAIL: ipc_msgbuf-Xraw.gen ========================= msgget\(0, 0x200\|0700\) = 26 msgsnd\(26, \{9199991941521739245, "STRACE_STRING\\0"\}, 14, 0\) = 0 msgrcv\(26, \{9199991941521739245, "STRACE_STRING\\0"\}, 14, -9199991941521739245, 0\) = 14 msgctl\(26, (0x100\|)?0, NULL\) = 0 \+\+\+ exited with 0 \+\+\+ Failed patterns of expected output: #4: msgctl\(27, (0x100\|)?0, NULL\) = 0 Actual output: msgget(0, 0x200|0700) = 27 msgsnd(27, {9199991941521739245, "STRACE_STRING\0"}, 14, 0) = 0 msgrcv(27, {9199991941521739245, "STRACE_STRING\0"}, 14, -9199991941521739245, 0) = 14 msgctl(27, 0, NULL) = 0 +++ exited with 0 +++ ipc_msgbuf-Xraw.gen.test: failed test: ../../strace -a26 -v -e msgget,msgsnd,msgrcv,msgctl -Xraw -a22 ../ipc_msgbuf-Xraw output mismatch FAIL ipc_msgbuf-Xraw.gen.test (exit status: 1) FAIL: ipc_shm.gen ================= Failed patterns of expected output: #15: shmctl\(11, (IPC_64\|)?IPC_RMID, NULL\) = 0 Actual output: shmget(0xfdb97531, 16051074064915160786, 000) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 21<<SHM_HUGE_SHIFT|000) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 0x2ce0000|0125) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, IPC_CREAT|IPC_EXCL|SHM_HUGETLB|SHM_NORESERVE|0x2ce0000|0125) = -1 EPERM (Operation not permitted) shmget(0xfdb97531, 16051074064915160786, IPC_CREAT|IPC_EXCL|SHM_HUGETLB|SHM_NORESERVE|0x2ce0000|21<<SHM_HUGE_SHIFT|0125) = -1 EPERM (Operation not permitted) shmget(0xfdb97531, 16051074064915160786, 0x2ce0000|21<<SHM_HUGE_SHIFT|0125) = -1 ENOENT (No such file or directory) shmget(IPC_PRIVATE, 1, 0600) = 11 shmctl(-553988399, 0xdefaced2 /* SHM_??? */, NULL) = -1 EINVAL (Invalid argument) shmctl(-553988399, IPC_STAT, 0xffffffffffffffff) = -1 EINVAL (Invalid argument) shmctl(11, IPC_STAT, {shm_perm={uid=30001, gid=30000, mode=0600, key=0, cuid=30001, cgid=30000}, shm_segsz=1, shm_cpid=30089, shm_lpid=0, shm_nattch=0, shm_atime=0, shm_dtime=0, shm_ctime=1565019843}) = 0 shmctl(11, IPC_SET, {shm_perm={uid=30001, gid=30000, mode=0600}, ...}) = 0 shmctl(0, SHM_INFO, 0x7fffffff6db0) = 11 shmctl(11, SHM_STAT, 0x7fffffff6db0) = 11 shmctl(11, SHM_STAT_ANY, 0x7fffffff6db0) = 11 shmctl(11, IPC_RMID, NULL) = 0 +++ exited with 0 +++ ipc_shm.gen.test: failed test: ../../strace -eipc -a29 ../ipc_shm output mismatch FAIL ipc_shm.gen.test (exit status: 1) FAIL: ipc_shm-Xabbrev.gen ========================= Failed patterns of expected output: #15: shmctl\(13, (IPC_64\|)?IPC_RMID, NULL\) = 0 Actual output: shmget(0xfdb97531, 16051074064915160786, 000) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 21<<SHM_HUGE_SHIFT|000) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 0x2ce0000|0125) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, IPC_CREAT|IPC_EXCL|SHM_HUGETLB|SHM_NORESERVE|0x2ce0000|0125) = -1 EPERM (Operation not permitted) shmget(0xfdb97531, 16051074064915160786, IPC_CREAT|IPC_EXCL|SHM_HUGETLB|SHM_NORESERVE|0x2ce0000|21<<SHM_HUGE_SHIFT|0125) = -1 EPERM (Operation not permitted) shmget(0xfdb97531, 16051074064915160786, 0x2ce0000|21<<SHM_HUGE_SHIFT|0125) = -1 ENOENT (No such file or directory) shmget(IPC_PRIVATE, 1, 0600) = 13 shmctl(-553988399, 0xdefaced2 /* SHM_??? */, NULL) = -1 EINVAL (Invalid argument) shmctl(-553988399, IPC_STAT, 0xffffffffffffffff) = -1 EINVAL (Invalid argument) shmctl(13, IPC_STAT, {shm_perm={uid=30001, gid=30000, mode=0600, key=0, cuid=30001, cgid=30000}, shm_segsz=1, shm_cpid=30122, shm_lpid=0, shm_nattch=0, shm_atime=0, shm_dtime=0, shm_ctime=1565019843}) = 0 shmctl(13, IPC_SET, {shm_perm={uid=30001, gid=30000, mode=0600}, ...}) = 0 shmctl(0, SHM_INFO, 0x7fffffff6d90) = 13 shmctl(13, SHM_STAT, 0x7fffffff6d90) = 13 shmctl(13, SHM_STAT_ANY, 0x7fffffff6d90) = 13 shmctl(13, IPC_RMID, NULL) = 0 +++ exited with 0 +++ ipc_shm-Xabbrev.gen.test: failed test: ../../strace -eipc -Xabbrev -a29 ../ipc_shm-Xabbrev output mismatch FAIL ipc_shm-Xabbrev.gen.test (exit status: 1) FAIL: ipc_shm-Xverbose.gen ========================== Failed patterns of expected output: #15: shmctl\(17, (0x100 /\* IPC_64 \*/\|)?0 /\* IPC_RMID \*/, NULL\) = 0 Actual output: shmget(0xfdb97531, 16051074064915160786, 000) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 21<<26 /* SHM_HUGE_SHIFT */|000) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 0x2ce0000|0125) = -1 ENOENT (No such file or directory) shmget(0xfdb97531, 16051074064915160786, 0x2ce1e00 /* IPC_CREAT|IPC_EXCL|SHM_HUGETLB|SHM_NORESERVE|0x2ce0000 */|0125) = -1 EPERM (Operation not permitted) shmget(0xfdb97531, 16051074064915160786, 0x2ce1e00 /* IPC_CREAT|IPC_EXCL|SHM_HUGETLB|SHM_NORESERVE|0x2ce0000 */|21<<26 /* SHM_HUGE_SHIFT */|0125) = -1 EPERM (Operation not permitted) shmget(0xfdb97531, 16051074064915160786, 0x2ce0000|21<<26 /* SHM_HUGE_SHIFT */|0125) = -1 ENOENT (No such file or directory) shmget(0 /* IPC_PRIVATE */, 1, 0600) = 17 shmctl(-553988399, 0xdefaced2 /* SHM_??? */, NULL) = -1 EINVAL (Invalid argument) shmctl(-553988399, 0x2 /* IPC_STAT */, 0xffffffffffffffff) = -1 EINVAL (Invalid argument) shmctl(17, 0x2 /* IPC_STAT */, {shm_perm={uid=30001, gid=30000, mode=0600, key=0, cuid=30001, cgid=30000}, shm_segsz=1, shm_cpid=30187, shm_lpid=0, shm_nattch=0, shm_atime=0, shm_dtime=0, shm_ctime=1565019843}) = 0 shmctl(17, 0x1 /* IPC_SET */, {shm_perm={uid=30001, gid=30000, mode=0600}, ...}) = 0 shmctl(0, 0xe /* SHM_INFO */, 0x7fffffff6d90) = 17 shmctl(17, 0xd /* SHM_STAT */, 0x7fffffff6d90) = 17 shmctl(17, 0xf /* SHM_STAT_ANY */, 0x7fffffff6d90) = 17 shmctl(17, 0 /* IPC_RMID */, NULL) = 0 +++ exited with 0 +++ ipc_shm-Xverbose.gen.test: failed test: ../../strace -eipc -Xverbose -a36 ../ipc_shm-Xverbose output mismatch FAIL ipc_shm-Xverbose.gen.test (exit status: 1) --8<---------------cut here---------------end--------------->8--- ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 04/07: gnu: strace: Update to 5.2. 2019-08-05 16:31 ` 04/07: gnu: strace: Update to 5.2 Mark H Weaver @ 2019-08-05 17:39 ` Marius Bakke 2019-08-06 5:20 ` Mark H Weaver 2019-08-06 6:24 ` Mark H Weaver 2019-08-05 20:03 ` Tobias Geerinckx-Rice 1 sibling, 2 replies; 5+ messages in thread From: Marius Bakke @ 2019-08-05 17:39 UTC (permalink / raw) To: Mark H Weaver; +Cc: guix-devel [-- Attachment #1.1: Type: text/plain, Size: 1074 bytes --] Mark H Weaver <mhw@netris.org> writes: > Hi Marius, > > guix-commits@gnu.org writes: > >> mbakke pushed a commit to branch master >> in repository guix. >> >> commit 2e2db09280d114bbdd0744c73d02aa5c40abdf4a >> Author: Marius Bakke <mbakke@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. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.2: 0001-gnu-strace-Fix-test-failure-on-some-systems.patch --] [-- Type: text/x-patch, Size: 3208 bytes --] From bd4ca7a67ae51c0997dc372c1f664ff4c6846631 Mon Sep 17 00:00:00 2001 From: Marius Bakke <mbakke@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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 487 bytes --] ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: 04/07: gnu: strace: Update to 5.2. 2019-08-05 17:39 ` Marius Bakke @ 2019-08-06 5:20 ` Mark H Weaver 2019-08-06 6:24 ` Mark H Weaver 1 sibling, 0 replies; 5+ messages in thread From: Mark H Weaver @ 2019-08-06 5:20 UTC (permalink / raw) To: Marius Bakke; +Cc: guix-devel Hi Marius, Marius Bakke <mbakke@fastmail.com> wrote: > Mark H Weaver <mhw@netris.org> writes: > >> 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. Heh :) > 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. It made no difference, but further investigation revealed that the changes implied by the patch (e.g. changing -a22 to -a20 in the ipc_msgbuf-Xraw test) were not actually applied in practice. Those switches are included in the 'tests/test-suite.log' output, and they are unchanged from before this patch was applied. It turns out that many other files included in the release tarball are generated from 'tests/gen_tests.in' using the 'tests/gen_tests.sh' script, and they are not automatically updated by the normal build process after patching 'tests/gen_tests.in', at least not when all the files have the same timestamp. To be continued ... Thanks, Mark ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 04/07: gnu: strace: Update to 5.2. 2019-08-05 17:39 ` Marius Bakke 2019-08-06 5:20 ` Mark H Weaver @ 2019-08-06 6:24 ` Mark H Weaver 1 sibling, 0 replies; 5+ messages in thread From: Mark H Weaver @ 2019-08-06 6:24 UTC (permalink / raw) To: Marius Bakke; +Cc: guix-devel Hi Marius, Marius Bakke <mbakke@fastmail.com> wrote: > 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. I needed to add another phase to run 'tests/gen_tests.sh', and with that addition, strace-5.2 now successfully passes all tests on my system. I went ahead and pushed the resulting fix to the 'master' branch as commit 2426e2c94cdf9fcf28bba28b1e84b1aa5f652332. Thanks very much for your quick response to this issue. Best, Mark ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 04/07: gnu: strace: Update to 5.2. 2019-08-05 16:31 ` 04/07: gnu: strace: Update to 5.2 Mark H Weaver 2019-08-05 17:39 ` Marius Bakke @ 2019-08-05 20:03 ` Tobias Geerinckx-Rice 1 sibling, 0 replies; 5+ messages in thread From: Tobias Geerinckx-Rice @ 2019-08-05 20:03 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 471 bytes --] Mark, Marius, Mark H Weaver 写道： > 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. The same 4 tests failed for me on a 6-core E5-2620v3 Guix System running Linux Libre 5.2.5. Kind regards, T G-R [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-06 6:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190804160223.1357.19402@vcs0.savannah.gnu.org>
[not found] ` <20190804160224.A29E4209DE@vcs0.savannah.gnu.org>
2019-08-05 16:31 ` 04/07: gnu: strace: Update to 5.2 Mark H Weaver
2019-08-05 17:39 ` Marius Bakke
2019-08-06 5:20 ` Mark H Weaver
2019-08-06 6:24 ` Mark H Weaver
2019-08-05 20:03 ` Tobias Geerinckx-Rice
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).