github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-19 04:42:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a test that nohup works

Browse Source 
If fish is invoked with nohup, then its children should be nohup too.
This commit is contained in:
ridiculousfish 2020-08-10 12:26:30 -07:00
parent 46a69d6b90
commit 8301aa9929
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/fish_test_helper.cpp
View File

@ -74,6 +74,17 @@ static void print_fds() {
fputc('\n', stdout);
}
static void print_signal(int sig) {
// Print a signal description to stderr.
if (const char *s = strsignal(sig)) {
fprintf(stderr, "%s", s);
if (strchr(s, ':') == nullptr) {
fprintf(stderr, ": %d", sig);
}
fprintf(stderr, "\n");
}
}
static void print_blocked_signals() {
sigset_t sigs;
sigemptyset(&sigs);
@ -87,13 +98,17 @@ static void print_blocked_signals() {
// NetBSD taps out at 63, Linux at 64.
for (int sig = 1; sig < 33; sig++) {
if (sigismember(&sigs, sig)) {
if (const char *s = strsignal(sig)) {
fprintf(stderr, "%s", s);
if (strchr(s, ':') == nullptr) {
fprintf(stderr, ": %d", sig);
}
fprintf(stderr, "\n");
}
print_signal(sig);
}
}
}
static void print_ignored_signals() {
for (int sig = 1; sig < 33; sig++) {
struct sigaction act = {};
sigaction(sig, nullptr, &act);
if (act.sa_handler == SIG_IGN) {
print_signal(sig);
}
}
}
@ -125,6 +140,8 @@ static fth_command_t s_commands[] = {
{"print_fds", print_fds, "Print the list of active FDs to stdout"},
{"print_blocked_signals", print_blocked_signals,
"Print to stdout the name(s) of blocked signals"},
{"print_ignored_signals", print_ignored_signals,
"Print to stdout the name(s) of ignored signals"},
{"help", show_help, "Print list of fish_test_helper commands"},
};

9
tests/checks/sigint.fish
View File

@ -1,7 +1,14 @@
#RUN: %fish -C "set helper %fish_test_helper" %s
# Block some signals if job control is off (#6828).
# Check that nohup is propagated.
set fish (status fish-path)
set output_path (mktemp)
nohup $fish -c "$helper print_ignored_signals" 2>&1 > $output_path
cat $output_path
# CHECK: Hangup: 1
rm $output_path
# Block some signals if job control is off (#6828).
status job-control none
for fish_use_posix_spawn in 0 1
$helper print_blocked_signals &