From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06012138334 for ; Thu, 10 Jan 2019 09:06:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEB59E0A00; Thu, 10 Jan 2019 09:06:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E6B5E0A00 for ; Thu, 10 Jan 2019 09:06:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1A17335CD5 for ; Thu, 10 Jan 2019 09:06:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB2424FB for ; Thu, 10 Jan 2019 09:06:41 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1547110845.3df1fcdb8134cbf3c03ed18301323eef84113221.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/fish/files/fix-histfile-test-on-ppc.patch app-shells/fish/fish-2.7.1.ebuild app-shells/fish/fish-3.0.0-r1.ebuild X-VCS-Directories: app-shells/fish/ app-shells/fish/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 3df1fcdb8134cbf3c03ed18301323eef84113221 X-VCS-Branch: master Date: Thu, 10 Jan 2019 09:06:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22162bcc-664f-441b-9177-3b6fe72b6edb X-Archives-Hash: bdb8aa33aa83894077242d400137a167 commit: 3df1fcdb8134cbf3c03ed18301323eef84113221 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jan 10 09:00:12 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jan 10 09:00:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df1fcdb app-shells/fish: fix single test failing on 32bit arches Closes: https://bugs.gentoo.org/656246 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> .../fish/files/fix-histfile-test-on-ppc.patch | 31 ++++++++++++++++++++++ app-shells/fish/fish-2.7.1.ebuild | 5 ++-- app-shells/fish/fish-3.0.0-r1.ebuild | 4 ++- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app-shells/fish/files/fix-histfile-test-on-ppc.patch b/app-shells/fish/files/fix-histfile-test-on-ppc.patch new file mode 100644 index 00000000000..8b9540ffc61 --- /dev/null +++ b/app-shells/fish/files/fix-histfile-test-on-ppc.patch @@ -0,0 +1,31 @@ +From 2c01e67a74ca48ca87e2f11f6239d54c35551e7b Mon Sep 17 00:00:00 2001 +From: David Adam +Date: Sat, 5 Jan 2019 15:59:25 +0800 +Subject: [PATCH] histfile tests: tweak expect commands to avoid crash on + 32-bit platforms + +Rather than killing the process with close, read EOF after sending the +"exit" command and wait for OS cleanup (per the expect examples). + +Not cleaning up with wait caused expect to crash on all 32-bit platforms +including i586 and armv7l with "alloc: invalid block: 0xbf993ccb: 3d 3b". + +64-bit platforms were not affected, for reasons that are not clear. +--- + tests/histfile.expect | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/histfile.expect b/tests/histfile.expect +index 81ca11276..7ac056235 100644 +--- a/tests/histfile.expect ++++ b/tests/histfile.expect +@@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" { + # ============= + # Start by shutting down the previous shell. + send "exit\r" +-close $spawn_id ++expect eof ++wait + + # Set the fish_history env var. + set ::env(fish_history) env diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild index b58c91c63b0..2bc49389213 100644 --- a/app-shells/fish/fish-2.7.1.ebuild +++ b/app-shells/fish/fish-2.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,8 @@ DEPEND=" test? ( dev-tcltk/expect ) " -PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" ) +PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" + "${FILESDIR}/fix-histfile-test-on-ppc.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/app-shells/fish/fish-3.0.0-r1.ebuild b/app-shells/fish/fish-3.0.0-r1.ebuild index e9917b07a6c..8cc9571025c 100644 --- a/app-shells/fish/fish-3.0.0-r1.ebuild +++ b/app-shells/fish/fish-3.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,8 @@ DEPEND="${RDEPEND} test? ( dev-tcltk/expect ) " +PATCHES=( "${FILESDIR}/fix-histfile-test-on-ppc.patch" ) + S="${WORKDIR}/${MY_P}" src_prepare() {