Re: [LTP] [PATCH] mprotect02: fix error of the case need sighandler()

[Peng Haitao <penght@cn.fujitsu.com>]

Hi Garrett,

Garrett Cooper said the following on 2011-1-21 12:00:
>> This is OK, but the default signal handler is invoked when an unexpected signal
>> is caught. so I think we should add sighandler(). Furthermore, the default
>> signal handler make the child process exit 2, but the case expect the child
>> process exit 1, this will cause the case fail.
>>
>> The following patch will reinitialize signal handler.
> 
>     This won't work if the number of test loops is > 1 (it will reset
> the handler back to the default and fail on the next iteration).

Thanks for your comment.

The following patch will initialize signal handler to sighandler() in loops starting,
and reinitialize default signal handle in the second part.

Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
---
 testcases/kernel/syscalls/mprotect/mprotect02.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/testcases/kernel/syscalls/mprotect/mprotect02.c b/testcases/kernel/syscalls/mprotect/mprotect02.c
index ebc4bcc..f27d2da 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect02.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect02.c
@@ -65,6 +65,7 @@
 
 void cleanup(void);
 void setup(void);
+void sighandler(int);
 
 char *TCID = "mprotect02";
 int TST_TOTAL = 1;
@@ -93,6 +94,9 @@ int main(int ac, char **av)
 	/* The following loop checks looping state if -i option given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
+		/* Initialization signal handler */
+		tst_sig(FORK, sighandler, NULL);
+
 		/* reset Tst_count in case we are looping */
 		Tst_count = 0;
 
@@ -129,6 +133,9 @@ int main(int ac, char **av)
 			tst_brkm(TBROK, cleanup, "child failed");
 		 }
 
+		/* Re-Initialization signal handler */
+		tst_sig(FORK, DEF_HANDLER, NULL);
+
 		/*
 		 * Change the protection to WRITE.
 		 */
@@ -198,13 +205,20 @@ int main()
 
 #endif /* UCLINUX */
 
+void sighandler(int sig)
+{
+	tst_resm(TINFO, "received signal: %d", sig);
+	if (sig == SIGSEGV)
+		exit(1);
+	else
+		tst_brkm(TBROK, 0, "Unexpected signal %d received.", sig);
+}
+
 /*
  * setup() - performs all ONE TIME setup for this test
  */
 void setup()
 {
-	tst_sig(FORK, DEF_HANDLER, NULL);
-
 	TEST_PAUSE;
 
 	tst_tmpdir();		/* create a temporary directory, cd to it */
-- 
1.7.3.1


-- 
Best Regards,
Peng Haitao


------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list