mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-12-19 05:13:44 +08:00
5c8b6adc2c
Some checks failed
make test / ubuntu (push) Waiting to run
make test / ubuntu-32bit-static-pcre2 (push) Waiting to run
make test / ubuntu-asan (push) Waiting to run
make test / macos (push) Waiting to run
Rust checks / rustfmt (push) Waiting to run
Rust checks / clippy (push) Waiting to run
Lock threads / lock (push) Has been cancelled
fish will print messages for some jobs when they exit abnormally, such as with SIGABRT. If a job exits abnormally inside the prompt, then (prior to this commit) fish would print the message and re-trigger the prompt, which could result in an infinite loop. This has existed for a very long time. Fix it by reaping jobs after running the prompt, and NOT triggering a redraw based on that reaping. We still print the message but the prompt is not executed. Add a test. Fixes #9796
31 lines
973 B
Python
31 lines
973 B
Python
#!/usr/bin/env python3
|
|
from pexpect_helper import SpawnedProc
|
|
import re
|
|
|
|
sp = SpawnedProc()
|
|
send, sendline, sleep, expect_prompt, expect_re, expect_str = (
|
|
sp.send,
|
|
sp.sendline,
|
|
sp.sleep,
|
|
sp.expect_prompt,
|
|
sp.expect_re,
|
|
sp.expect_str,
|
|
)
|
|
expect_prompt()
|
|
|
|
# Regression test for 9796
|
|
# If a process in the prompt exits with a status that would cause a message to be printed,
|
|
# don't trigger another prompt execution which would result in an infinite loop.
|
|
sendline("sh -c 'kill -ABRT $$'")
|
|
expect_prompt(re.escape("fish: Job 1, 'sh -c 'kill -ABRT $$'' terminated by signal SIGABRT (Abort)"))
|
|
|
|
# Copy current prompt so we can reuse it.
|
|
sendline("functions --copy fish_prompt fish_prompt_orig")
|
|
expect_prompt()
|
|
|
|
sendline("function fish_prompt; sh -c 'kill -ABRT $$'; fish_prompt_orig; end")
|
|
expect_prompt(re.escape("fish: Job 1, 'sh -c 'kill -ABRT $$'' terminated by signal SIGABRT (Abort)"))
|
|
|
|
sendline("echo still alive!")
|
|
expect_prompt("still alive!")
|