Make it easy to read.
Signed-off-by: Monson Shao <[email protected]>
---
testcases/kernel/containers/pidns/pidns16.c | 24 ++++++++++++++++--------
1 个文件被修改，插入 16 行(+)，删除 8 行(-)
diff --git a/testcases/kernel/containers/pidns/pidns16.c
b/testcases/kernel/containers/pidns/pidns16.c
index 8a232c6..9a1219a 100644
--- a/testcases/kernel/containers/pidns/pidns16.c
+++ b/testcases/kernel/containers/pidns/pidns16.c
@@ -70,17 +70,25 @@ 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);
+ if (c == 1)
+ expected_pid = globalpid;
+ else if (c == 2)
+ expected_pid = CHILD_PID;
+ else {
+ tst_resm(TBROK, "child should NOT be signalled 3+ times");
+ return;
+ }
+
+ if (si->si_pid == expected_pid)
+ tst_resm(TINFO, "child is signalled from 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++;
}
--
1.7.11.7
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
