]> granicus.if.org Git - strace/commitdiff
tests/ppoll: replace SIGABRT with SIGHUP
authorDmitry V. Levin <ldv@altlinux.org>
Sat, 1 Aug 2015 08:55:32 +0000 (08:55 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sat, 1 Aug 2015 16:52:13 +0000 (16:52 +0000)
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.

tests/ppoll-v.expected
tests/ppoll.c
tests/ppoll.expected

index 4813ecf819c7c7528a08e55c2b7f69c7984680c5..d07eac539e60708f53e7d45baca92836a1b5896f 100644 (file)
@@ -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 .*
index 978bbb8a947267f6f95aa08dd3dae1dd97c5ae9e..f99b7228027f79be87a48150b14d5ddb08acc3db 100644 (file)
@@ -36,7 +36,7 @@ test2(void)
        };
 
        sigfillset(&mask);
-       sigdelset(&mask, SIGABRT);
+       sigdelset(&mask, SIGHUP);
        sigdelset(&mask, SIGKILL);
        sigdelset(&mask, SIGSTOP);
 
index 8dc518f367f612e2d4d336d45f40e28e64da09af..e6246fa2f831e9f74b6d6f947387fb74ca158f2e 100644 (file)
@@ -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 .*