Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ostest: sigprocmask testcase fix #1857

Merged
merged 1 commit into from
Aug 1, 2023
Merged

ostest: sigprocmask testcase fix #1857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions testing/ostest/sigprocmask.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,19 @@ void sigprocmask_test(void)
{
int signo = g_some_signals[i];

ret = sigaddset(&newmask, signo);
if (ret != OK)
/* SIGKILL and SIGSTOP should not be added to signal mask */

if (signo != SIGKILL && signo != SIGSTOP)
{
int errcode = errno;
printf("sigprocmask_test: ERROR sigaddset failed: %d\n", errcode);
ASSERT(false);
goto errout_with_mask;
ret = sigaddset(&newmask, signo);
if (ret != OK)
{
int errcode = errno;
printf("sigprocmask_test: ERROR sigaddset failed: %d\n",
errcode);
ASSERT(false);
goto errout_with_mask;
}
}

ret = sighold(signo);
Expand Down Expand Up @@ -195,6 +201,28 @@ void sigprocmask_test(void)
goto errout_with_mask;
}

/* SIGKILL and SIGSTOP should never be added to signal mask,
* so delete them from newmask before comparing.
*/

ret = sigdelset(&newmask, SIGKILL);
if (ret != OK)
{
int errcode = errno;
printf("sigprocmask_test: ERROR sigprocmask failed: %d\n", errcode);
ASSERT(false);
goto errout_with_mask;
}

ret = sigdelset(&newmask, SIGSTOP);
if (ret != OK)
{
int errcode = errno;
printf("sigprocmask_test: ERROR sigprocmask failed: %d\n", errcode);
ASSERT(false);
goto errout_with_mask;
}

/* It should be the same as newmask */

if (memcmp(&currmask, &newmask, sizeof(sigset_t)) != 0)
Expand Down
Loading