github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-29 05:03:46 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

histfile tests: tweak expect commands to avoid crash on 32-bit platforms

Browse Source 
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.
This commit is contained in:
David Adam 2019-01-05 15:59:25 +08:00
parent 4f196eef64
commit 2c01e67a74
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/histfile.expect
View File

@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" {
# ============= # =============
# Start by shutting down the previous shell. # Start by shutting down the previous shell.
send "exit\r" send "exit\r"
close $spawn_id expect eof
wait
# Set the fish_history env var. # Set the fish_history env var.
set ::env(fish_history) env set ::env(fish_history) env