From 8df07e10395552076ab1ebb9c806f0c47c5c7bed Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 10 Jan 2016 22:48:51 +0000 Subject: [PATCH] sigreturn.test: use RT_5 signal number instead of RT_2 Make the test compatible with musl libc that uses RT_2 internally. * tests/sigreturn.c (main): Replace RT_2 with RT_5. * tests/sigreturn.test: Likewise. Reported-by: Szabolcs Nagy --- tests/sigreturn.c | 4 ++-- tests/sigreturn.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sigreturn.c b/tests/sigreturn.c index f6284c80..dace040a 100644 --- a/tests/sigreturn.c +++ b/tests/sigreturn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Dmitry V. Levin + * Copyright (c) 2015-2016 Dmitry V. Levin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,9 +45,9 @@ int main(void) { sigemptyset(&set); sigaddset(&set, SIGUSR2); sigaddset(&set, SIGCHLD); - sigaddset(&set, RT_0 + 2); sigaddset(&set, RT_0 + 3); sigaddset(&set, RT_0 + 4); + sigaddset(&set, RT_0 + 5); sigaddset(&set, RT_0 + 26); sigaddset(&set, RT_0 + 27); sigprocmask(SIG_SETMASK, &set, NULL); diff --git a/tests/sigreturn.test b/tests/sigreturn.test index bc8dcbde..f9a612bf 100755 --- a/tests/sigreturn.test +++ b/tests/sigreturn.test @@ -2,7 +2,7 @@ # # Check rt_sigprocmask and sigreturn/rt_sigreturn decoding. # -# Copyright (c) 2015 Dmitry V. Levin +# Copyright (c) 2015-2016 Dmitry V. Levin # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ run_prog run_strace -esignal $args -mask='\[(USR2 CHLD|CHLD USR2) RT_2 RT_3 RT_4 RT_26 RT_27\]' +mask='\[(USR2 CHLD|CHLD USR2) RT_3 RT_4 RT_5 RT_26 RT_27\]' rt_sigprocmask='rt_sigprocmask\(SIG_SETMASK, '"$mask"', NULL, [[:digit:]]+\) += 0' osf_sigprocmask='osf_sigprocmask\(SIG_SETMASK, '"$mask"'\) += 0 +\(old mask \[[^]]*\]\)' EXPECTED="$LOG.expected" -- 2.40.0