From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kKNZJ7rWM2EbAwEAgWs5BA (envelope-from ) for ; Sat, 04 Sep 2021 22:27:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yHQdI7rWM2GrRAAA1q6Kng (envelope-from ) for ; Sat, 04 Sep 2021 20:27:38 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F0BB713CE3 for ; Sat, 4 Sep 2021 22:27:37 +0200 (CEST) Received: from localhost ([::1]:58402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMbov-0000GT-Hw for larch@yhetil.org; Sat, 04 Sep 2021 15:59:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMboc-0000EN-23 for bug-guix@gnu.org; Sat, 04 Sep 2021 15:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMbob-0003tr-Pv for bug-guix@gnu.org; Sat, 04 Sep 2021 15:59:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMbob-0008UZ-LF for bug-guix@gnu.org; Sat, 04 Sep 2021 15:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50346: [PATCH core-updates-frozen] gnu: strace: Allow readlink, readlinkat tests to pass. References: <875yvi93w8.fsf@simonsouth.net> In-Reply-To: <875yvi93w8.fsf@simonsouth.net> Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 04 Sep 2021 19:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50346 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 50346@debbugs.gnu.org Received: via spool by 50346-submit@debbugs.gnu.org id=B50346.163078551932616 (code B ref 50346); Sat, 04 Sep 2021 19:59:01 +0000 Received: (at 50346) by debbugs.gnu.org; 4 Sep 2021 19:58:39 +0000 Received: from localhost ([127.0.0.1]:48692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMbo8-0008Tr-9p for submit@debbugs.gnu.org; Sat, 04 Sep 2021 15:58:39 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:33352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMbo6-0008Td-8T for 50346@debbugs.gnu.org; Sat, 04 Sep 2021 15:58:31 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 517DE3327E for <50346@debbugs.gnu.org>; Sat, 4 Sep 2021 19:58:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo03-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9VyS0TkER8sN for <50346@debbugs.gnu.org>; Sat, 4 Sep 2021 19:58:24 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E3F8633276 for <50346@debbugs.gnu.org>; Sat, 4 Sep 2021 19:58:23 +0000 (UTC) From: Simon South Date: Sat, 4 Sep 2021 15:58:21 -0400 Message-Id: <20210904195821.14743-1-simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630787258; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=iYrgZPYIj6eYQ8AdX2sCy6r8CDUP+1WzcBCwdmcD4uc=; b=AUHXB/STGhjt5BdMYp6wtz2akpS2r9uzMaI0sfHBOOLUhnuwk2kmopOXyfxh7Xfza7ceCk klcteeeGV0nKc+hbHVxylf9athUCHRdVGwEspU1Iwpc1K5U+NLIo+GrqVwd9zAzOKkD1Bg uoawWhqH6LoK6ClBaFBTMvE1yt+uM30lQYRqtTITSsBMZ7Yx7CzN77HAL6ehJj7bRAQ3mL wHoypQ5bEgGdwsM0IL4ydf8mZlkf7qpBHUYk7PMyohkJGEG6hNHUyxWt5llJyXWnjK3amH BxRhaeBZWqb86gJYZ7MsbpJs9Bd4quGyBOrtP6WMQubHjsR7lKl6SWmQkk3gEQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630787258; a=rsa-sha256; cv=none; b=hratF7GpBBt0mr2KqvVNzXsz7DfMS77KSNzLUhA775GhczKsFEtaCaeUBIzyl+eFVGWBxe Wsr7pe5cvKkCcXCtJu4Xercp1g2wOuKUKxCEbTudfHxemLUj3BLmN44V5ZC5zqz7zluOuO hHKZChH6QAfwDHFC4BpKh5bPgI4sZk32UjSDzSM8nO1bf+BpORYB6ZsndVIUkf+JSS6HbK Fcfgg9Xd8dP/dc8//egG4P1OwbggFL/nBc3sWS9Cxy+ndaQfcq8pvUu0NR/78vkXZkoXh5 ucx0rEpmHwC9sdcxZs38YdXxgv4bImMiaY7OCxSena9AohgeXFNswB0QJeEuAg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 4.08 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: F0BB713CE3 X-Spam-Score: 4.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: eF9dRcF4VQX7 Modify the invocation of strace's "readlink" and "readlinkat" tests to prevent them from failing due to an additional system call made by Guix's patched version of glibc. * gnu/packages/linux.scm (strace)[source]: Add patch. [arguments]<#:phases>: Do not disable the "readlink" test now that it can succeed. * gnu/packages/patches/strace-fix-readlink-readlinkat-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 8 ++-- ...strace-fix-readlink-readlinkat-tests.patch | 46 +++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/strace-fix-readlink-readlinkat-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index bb22e29caa..f9c8956568 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1547,6 +1547,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \ %D%/packages/patches/sqlite-hurd.patch \ + %D%/packages/patches/strace-fix-readlink-readlinkat-tests.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63f0e4108c..99b7ce7066 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2240,7 +2240,9 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "0mmns22bjjvakxj29si0x4dcylcgy26llpcimkb0llcxif439k2s")))) + "0mmns22bjjvakxj29si0x4dcylcgy26llpcimkb0llcxif439k2s")) + (patches + (search-patches "strace-fix-readlink-readlinkat-tests.patch")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2253,10 +2255,6 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (add-after 'unpack 'disable-failing-tests (lambda _ (substitute* "tests/Makefile.in" - ;; XXX: This test fails because an extra readlink call is made - ;; by the glibc when using the ld.so cache. - (("readlink.gen.test[^:]") " ") - ;; XXX: These hang forever even if the test time-out is ;; extended. (("^\tstrace-DD?D?\\.test \\\\.*") "") diff --git a/gnu/packages/patches/strace-fix-readlink-readlinkat-tests.patch b/gnu/packages/patches/strace-fix-readlink-readlinkat-tests.patch new file mode 100644 index 0000000000..dd5ee98703 --- /dev/null +++ b/gnu/packages/patches/strace-fix-readlink-readlinkat-tests.patch @@ -0,0 +1,46 @@ +Prevent strace's "readlink" and "readlinkat" tests from failing due to the +additional system call made by glibc with the patch "glibc-dl-cache.patch" +applied (introduced in commit 52564e9). + +These changes cause strace to report during these tests only system calls on +files contained in the test directory, effectively filtering out the +additional readlink/readlinkat call on "/proc/self/exe" and allowing the tests +to complete as normal. + +diff --git a/tests/gen_tests.in b/tests/gen_tests.in +index 8b4e2e9..cc3ca63 100644 +--- a/tests/gen_tests.in ++++ b/tests/gen_tests.in +@@ -623,8 +623,8 @@ quotactl-xfs-v -v -e trace=quotactl + read-write -a15 -eread=0,5 -ewrite=1,4 -e trace=read,write -P read-write-tmpfile -P /dev/zero -P /dev/null + readahead -a1 + readdir -a16 +-readlink -xx +-readlinkat -xx ++readlink -xx --trace-path=test.readlink.link ++readlinkat -xx --trace-path=test.readlinkat.link + reboot -s 256 + recv-MSG_TRUNC -a26 -e trace=recv + recvfrom -a35 +diff --git a/tests/readlink.gen.test b/tests/readlink.gen.test +index 4263234..418691b 100755 +--- a/tests/readlink.gen.test ++++ b/tests/readlink.gen.test +@@ -1,4 +1,4 @@ + #!/bin/sh -efu +-# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (readlink -xx ); do not edit. ++# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (readlink -xx --trace-path=test.readlink.link); do not edit. + . "${srcdir=.}/init.sh" +-run_strace_match_diff -xx ++run_strace_match_diff -xx --trace-path=test.readlink.link +diff --git a/tests/readlinkat.gen.test b/tests/readlinkat.gen.test +index d7de993..a48d590 100755 +--- a/tests/readlinkat.gen.test ++++ b/tests/readlinkat.gen.test +@@ -1,4 +1,4 @@ + #!/bin/sh -efu +-# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (readlinkat -xx ); do not edit. ++# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (readlinkat -xx --trace-path=test.readlinkat.link); do not edit. + . "${srcdir=.}/init.sh" +-run_strace_match_diff -xx ++run_strace_match_diff -xx --trace-path=test.readlinkat.link -- 2.25.2