From: Dmitry V. Levin Date: Sat, 1 Aug 2015 08:55:32 +0000 (+0000) Subject: tests/ppoll: replace SIGABRT with SIGHUP X-Git-Tag: v4.11~307 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c0453a1cb5b945d8c791de9a7bf15d6c3089769;p=strace tests/ppoll: replace SIGABRT with SIGHUP Use SIGHUP instead of SIGABRT, the number of the former is more portable across architectures. * tests/ppoll.c (test2): Replace SIGABRT with SIGHUP. * tests/ppoll.expected: Update regexp. * tests/ppoll-v.expected: Likewise. --- diff --git a/tests/ppoll-v.expected b/tests/ppoll-v.expected index 4813ecf8..d07eac53 100644 --- a/tests/ppoll-v.expected +++ b/tests/ppoll-v.expected @@ -1,3 +1,3 @@ ppoll\(\[\{fd=0, events=POLLIN\|POLLPRI\|POLLRDNORM\|POLLRDBAND\}, \{fd=1, events=POLLOUT(\|POLLWRNORM)?\|POLLWRBAND\}, \{fd=3, events=POLLIN\|POLLPRI\}, \{fd=4, events=POLLOUT\}\], 4, \{42, 999999999\}, \[(USR2 CHLD|CHLD USR2)\], (4|8|16)\) += 2 \(\[\{fd=1, revents=POLLOUT(\|POLLWRNORM)?\}, \{fd=4, revents=POLLOUT\}\], left \{42, 9[0-9]{8}\}\) -ppoll\(\[\{fd=1, events=POLLIN\|POLLPRI\|POLLRDNORM\|POLLRDBAND\}, \{fd=0, events=POLLOUT(\|POLLWRNORM)?\|POLLWRBAND\}\], 2, \{0, 999\}, ~\[ABRT KILL STOP[^]]*\], (4|8|16)\) += 0 \(Timeout\) +ppoll\(\[\{fd=1, events=POLLIN\|POLLPRI\|POLLRDNORM\|POLLRDBAND\}, \{fd=0, events=POLLOUT(\|POLLWRNORM)?\|POLLWRBAND\}\], 2, \{0, 999\}, ~\[HUP KILL STOP[^]]*\], (4|8|16)\) += 0 \(Timeout\) ppoll\(NULL, 42, NULL, NULL, (4|8|16)\) += -1 EFAULT .* diff --git a/tests/ppoll.c b/tests/ppoll.c index 978bbb8a..f99b7228 100644 --- a/tests/ppoll.c +++ b/tests/ppoll.c @@ -36,7 +36,7 @@ test2(void) }; sigfillset(&mask); - sigdelset(&mask, SIGABRT); + sigdelset(&mask, SIGHUP); sigdelset(&mask, SIGKILL); sigdelset(&mask, SIGSTOP); diff --git a/tests/ppoll.expected b/tests/ppoll.expected index 8dc518f3..e6246fa2 100644 --- a/tests/ppoll.expected +++ b/tests/ppoll.expected @@ -1,3 +1,3 @@ ppoll\(\[\{fd=0, events=POLLIN\|POLLPRI\|POLLRDNORM\|POLLRDBAND\}, \{fd=1, events=POLLOUT(\|POLLWRNORM)?\|POLLWRBAND\}, \.\.\.\], 4, \{42, 999999999\}, \[(USR2 CHLD|CHLD USR2)\], (4|8|16)\) += 2 \(\[\{fd=1, revents=POLLOUT(\|POLLWRNORM)?\}, \.\.\.\], left \{42, 9[0-9]{8}\}\) -ppoll\(\[\{fd=1, events=POLLIN\|POLLPRI\|POLLRDNORM\|POLLRDBAND\}, \{fd=0, events=POLLOUT(\|POLLWRNORM)?\|POLLWRBAND\}\], 2, \{0, 999\}, ~\[ABRT KILL STOP[^]]*\], (4|8|16)\) += 0 \(Timeout\) +ppoll\(\[\{fd=1, events=POLLIN\|POLLPRI\|POLLRDNORM\|POLLRDBAND\}, \{fd=0, events=POLLOUT(\|POLLWRNORM)?\|POLLWRBAND\}\], 2, \{0, 999\}, ~\[HUP KILL STOP[^]]*\], (4|8|16)\) += 0 \(Timeout\) ppoll\(NULL, 42, NULL, NULL, (4|8|16)\) += -1 EFAULT .*