diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
| commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
| tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /app-shells/fish/files | |
| parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) | |
gentoo resync : 12.01.2019
Diffstat (limited to 'app-shells/fish/files')
| -rw-r--r-- | app-shells/fish/files/fix-histfile-test-on-ppc.patch | 31 |
1 files changed, 31 insertions, 0 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 000000000000..8b9540ffc610 --- /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 <zanchey@ucc.gu.uwa.edu.au> +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 |