Re: [LTP] [PATCHv2 1/3] pidns16: split test condition and result judge

Wanlong Gao
2013-01-03T03:13:36Z

On 12/26/2012 04:48 PM, Monson Shao wrote:
> Make it easy to read.
>
> Signed-off-by: Monson Shao <jshao@redhat.com>
> ---
> testcases/kernel/containers/pidns/pidns16.c | 28 ++++++++++++++++++++--------
> 1 file changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/testcases/kernel/containers/pidns/pidns16.c b/testcases/kernel/containers/pidns/pidns16.c
> index 8a232c6..04a1641 100644
> --- a/testcases/kernel/containers/pidns/pidns16.c
> +++ b/testcases/kernel/containers/pidns/pidns16.c
> @@ -70,17 +70,29 @@ void cleanup()
> void child_signal_handler(int sig, siginfo_t * si, void *unused)
> {
> static int c = 1;
> + pid_t expected_pid;
> +
> /* Verifying from which process the signal handler is signalled */
>
> - if ((c == 1) && (si->si_pid == globalpid))
> - tst_resm(TINFO, "sig_handler is signalled from pid %d",
> - globalpid);
> - else if ((c == 2) && (si->si_pid == CHILD_PID))
> - tst_resm(TINFO, "sig_handler is signalled from pid %d",
> - CHILD_PID);
> + switch (c) {
> + case 1:
> + expected_pid = globalpid;
> + break;
> + case 2:
> + expected_pid = CHILD_PID;
> + break;
> + default:
> + tst_resm(TBROK, "child should NOT be signalled 3+ times");
> + return;

These two lines added spaces before TAB, I edit on site, please take care next time.

Thanks,
Wanlong Gao

> + }
> +
> + if (si->si_pid == expected_pid)
> + tst_resm(TINFO, "child is signalled from expected pid %d",
> + expected_pid);
> else
> - tst_resm(TBROK, "Unexpected value for Sending-ProcessID"
> - " when signal handler called %d\n", si->si_pid);
> + tst_resm(TBROK, "child is signalled from unexpected pid %d,"
> + " expecting pid %d", si->si_pid, expected_pid);
> +
> c++;
> }
>
>

------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at: