From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tomas Volf <~@wolfsden.cz> Newsgroups: gmane.lisp.guile.bugs Subject: bug#72547: [PATCH 6/9] tests: Fix spawn with #:environment on MacOS. Date: Sat, 10 Aug 2024 00:54:32 +0200 Message-ID: <20240809225435.19028-6-~@wolfsden.cz> References: <20240809225435.19028-1-~@wolfsden.cz> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21349"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Tomas Volf <~@wolfsden.cz> To: 72547@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Sat Aug 10 00:56:09 2024 Return-path: Envelope-to: guile-bugs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1scYWl-0005MN-PJ for guile-bugs@m.gmane-mx.org; Sat, 10 Aug 2024 00:56:07 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1scYWL-00063m-MC; Fri, 09 Aug 2024 18:55:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1scYWH-00060z-P8 for bug-guile@gnu.org; Fri, 09 Aug 2024 18:55:37 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1scYWG-00021M-Jh for bug-guile@gnu.org; Fri, 09 Aug 2024 18:55:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=LcMj9a4vC5rBPVlClCmKlInuRoy2/TCrhCgDsS3thlw=; b=XF3n4J72K2/vTOgqpo0tjqnVYFvKjqSAIKkSu6aWPDE6syfz8N3dBHC8iE5W+uGDdyEEOu5CJr7OQTxIM+SwWcmCJbPXetRjqLGFkj8RMGEwSfUaCQPUgnBMNK7obfcejxQNP1erreLopPIvX47naUB3TLENS8kAGtWhScaQyHjEp2DV65cin635FQDwQBgXo2cPxKnQSJUQjM4e5gnByntTMLS13P6k9LoKiCOsuuvllt26cQ7hIxhzsKe/zKnG4FOJL1yDEC+2IowcFZpWbuiKMHuZ8FJhbdqDkgJC63DZRL26O2ITW/7Sv1524GAFZYMefSdn7/elPNGhjSXaNA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1scYWj-00088f-2r for bug-guile@gnu.org; Fri, 09 Aug 2024 18:56:05 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Fri, 09 Aug 2024 22:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72547 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch Original-Received: via spool by 72547-submit@debbugs.gnu.org id=B72547.172324412131168 (code B ref 72547); Fri, 09 Aug 2024 22:56:05 +0000 Original-Received: (at 72547) by debbugs.gnu.org; 9 Aug 2024 22:55:21 +0000 Original-Received: from localhost ([127.0.0.1]:38745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1scYW1-00086b-0g for submit@debbugs.gnu.org; Fri, 09 Aug 2024 18:55:21 -0400 Original-Received: from wolfsden.cz ([37.205.8.62]:57790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1scYVu-00085J-Ee for 72547@debbugs.gnu.org; Fri, 09 Aug 2024 18:55:14 -0400 Original-Received: by wolfsden.cz (Postfix, from userid 104) id 568C42A8D0E; Fri, 9 Aug 2024 22:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1723244084; bh=fGN5GR1C89iNX6mD+tM9b1dhw2wHyu9WoCU7WMh8oWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DyzeZSc49QjYpTBilhqFZoK60uCSHsNucxBE6l6ZEixEKG0daidoo9eQtlqwaNfG0 Ff0QlPUlhjFz1UZpQXWJFqaVTVvyOxTW03zKklRWXMu0wwryGLCUe7hMrtPN5RjixJ C/Z3STzDdMHHiHtXlgOlA85QuKvmeej2PxAyyPYcmJob30Sjlguh6fxMFtwO5GLv39 A6kFe5+OsMJpvGcoz0gbnWssOYaFzqUhX4OmXUbD4xgGDpKKe6XLBUX8jfM0hsC8lM 36D/+likxBj9PiJh6RqrrXGZtPmvPc+q6TIAtD6W9zFz4XyjRVmRqDsFT5QTwIee+w vY+503DivKqUw68JFalYUeraxsze63JsdRd9NvqRj90R9OtYGhXl0jGg0fpKfeN3H3 IV4aOHRKIRffkASGPToU37wpWIPGHapFBcJRPOibXa7bE5S0GjSShkaS9YIvCD4HZk WNhZxS2PnHgMcSmMBMtnn/1c39hGtM1GA6OR58xdXo3OCILsTDAS3pmimMdsen7Myn v/TlBBOy/Z0Q8NjsLVCwg1aa+KhND6v6auQUBecJHy2R1Qcrzar2nEWHzD/Mi4yJ2H LgkjgwPA6/yN32GAlhxDqxAVERgmSA8V98y6e9X2Y7SwYxhG9z0S48qfcpsVymtsro PrMazYVJR8qaZAVMU9UeK2zE= Original-Received: from localhost (unknown [146.70.134.146]) by wolfsden.cz (Postfix) with ESMTPSA id 9ED332A8B23; Fri, 9 Aug 2024 22:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1723244083; bh=fGN5GR1C89iNX6mD+tM9b1dhw2wHyu9WoCU7WMh8oWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iLD58m0Zpbzop6uj35+EneZeqWOOuByhnN934bBZ3udehPKRCh2otk/p26H87XDP5 BviePfdcgGu+VnGt6AkbxhTJoyY+YU2tu9PhdSSXsj/sDvXcObbz7iteCpkY1udBVU P9S+piGFC5HuvrREvhlFG62CqTLp68pL4o6IUdJzatzf8DuBGB7aSDaIJt3mMkEwcE snkyI4pZnzYa2whCNdl1PFvMGQz+7w75qhQIS8P+oMwhHjvZXYZMhO8MAAb9kHpx/Y o4XYqAH//egQ7A2TDBXcqOQjU0IYRKLQNPPVEORPdpK9pMxo/CJCY0GAx0cp07q8ru +LHLQzYX6Dcq1i8aMKtlPPfclSFMXbe/pEOyS0KlLH0nUtkhwYDJp5juYYXKASjOm2 4/Xzbbij99OrlMZDexwYVNDjJSX7CU9vqPTSl8r5zr42u0RXKlf/Sj01XEkjVrOyFU yFB/7HlAuMaOrfU1NX7Z4hklK0qSFLlQrqipM4XjDUdlodZlKtJCjLSm8ZzJ9EgMEC QySr/D0+AHtiJyhkfrs0MKlBxbo3ylMzAgn8nE/9X1xE4XyWbTfqhogxx380Uffw3l TeLCRJzhdt/6pzO4W9TR5NrIyrCBkMRtg4Xtx6gFV6Wat9HIpuYwKOSFj+tIJMEVpR CFXQ5aoTzcj5cVPLzg7xdp7U= X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240809225435.19028-1-~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Original-Sender: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.bugs:10942 Archived-At: MacOS adds __CF_USER_TEXT_ENCODING to every program, in similar way GNU Hurd prepends LD_ORIGIN_PATH (based on the comment). So extend the logic to do similar stripping on MacOS. * test-suite/tests/posix.test ("spawn") ["env with #:environment and #:output"]: Strip trailing __CF_USER_TEXT_ENCODING environment variable when on Darwin. --- test-suite/tests/posix.test | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test index 18dad8902..ac5a3b289 100644 --- a/test-suite/tests/posix.test +++ b/test-suite/tests/posix.test @@ -442,12 +442,23 @@ (close-port (car input+output)) (waitpid pid) - ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for - ;; every program: . Strip it. - (if (and (string=? "GNU" (utsname:sysname (uname))) - (string-prefix? "LD_ORIGIN_PATH=" str)) - (string-drop str (+ 1 (string-index str #\newline))) - str)))) + (let ((sysname (utsname:sysname (uname)))) + (cond + ((string=? "GNU" sysname) + ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for + ;; every program: . Strip it. + (if (string-prefix? "LD_ORIGIN_PATH=" str) + (string-drop str (+ 1 (string-index str #\newline))) + str)) + ((string-ci=? "darwin" sysname) + ;; MacOS appends '__CF_USER_TEXT_ENCODING' for every program. Strip + ;; it. + (let ((pos (string-contains str "__CF_USER_TEXT_ENCODING="))) + (if pos + (string-drop-right str (- (string-length str) pos)) + str))) + (else + str)))))) (pass-if-equal "ls /proc/self/fd" "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd -- 2.45.2