Skip to contentSkip to conversation

semop/semop02.c: add ERANGE error value test

PATCH Applied Xiaoguang Wang 3 participants 3 messages Dec 26, 2013 – Jan 21, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 semop/semop02.c: add ERANGE error value test

---
 testcases/kernel/syscalls/ipc/semop/semop02.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop02.c +17 -4
index 08fc43c..b2ed38c 100644
@@ -19,7 +19,7 @@
 
 /*
  * DESCRIPTION
- *	semop02 - test for E2BIG, EACCES, EFAULT and EINVAL errors
+ *	semop02 - test for E2BIG, EACCES, EFAULT, EINVAL and ERANGE errors
  *
  * HISTORY
  *	03/2001 - Written by Wayne Boyer
@@ -29,6 +29,7 @@
  *        conflict with the key from another task.
  */
 
+#define _GNU_SOURCE
 #include <pwd.h>
 #include "test.h"
 #include "safe_macros.h"
@@ -38,7 +39,7 @@ char *TCID = "semop02";
 
 static void semop_verify(int i);
 
-static int exp_enos[] = { E2BIG, EACCES, EFAULT, EINVAL, 0 };
+static int exp_enos[] = { E2BIG, EACCES, EFAULT, EINVAL, ERANGE, 0 };
 int sem_id_1 = -1;	/* a semaphore set with read & alter permissions */
 int sem_id_2 = -1;	/* a semaphore set without read & alter permissions */
 int bad_id = -1;
@@ -50,7 +51,6 @@ int badbuf = -1;
 #define NSOPS	5		/* a resonable number of operations */
 #define	BIGOPS	1024		/* a value that is too large for the number */
 				/* of semop operations that are permitted   */
-
 struct test_case_t {
 	int *semid;
 	struct sembuf *t_sbuf;
@@ -61,7 +61,8 @@ struct test_case_t {
 	{&sem_id_2, (struct sembuf *)&s_buf, NSOPS, EACCES},
 	{&sem_id_1, (struct sembuf *)-1, NSOPS, EFAULT},
 	{&sem_id_1, (struct sembuf *)&s_buf, 0, EINVAL},
-	{&bad_id, (struct sembuf *)&s_buf, NSOPS, EINVAL}
+	{&bad_id, (struct sembuf *)&s_buf, NSOPS, EINVAL},
+	{&sem_id_1, (struct sembuf *)&s_buf, 1, ERANGE}
 };
 
 int TST_TOTAL = ARRAY_SIZE(TC);
@@ -94,6 +95,8 @@ void setup(void)
 	char nobody_uid[] = "nobody";
 	struct passwd *ltpuser;
 	key_t semkey2;
+	struct seminfo ipc_buf;
+	union semun arr;
 
 	tst_require_root(NULL);
 
@@ -127,6 +130,16 @@ void setup(void)
 		tst_brkm(TBROK | TERRNO, cleanup,
 			 "couldn't create semaphore in setup");
 	}
+
+	arr.ipc_buf = &ipc_buf;
+	if (semctl(sem_id_1, 0, IPC_INFO, arr) == -1)
+		tst_brkm(TBROK | TERRNO, cleanup, "semctl() IPC_INFO failed");
+
+	/* for ERANGE errno test */
+	arr.val = 1;
+	s_buf[0].sem_op = ipc_buf.semvmx;
+	if (semctl(sem_id_1, 0, SETVAL, arr) == -1)
+		tst_brkm(TBROK | TERRNO, cleanup, "semctl() SETVAL failed");
 }
 
 static void semop_verify(int i)
Signature · 13 lines
1.8.2.1


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
Reviewed-by on v1 2/2
#1 lore raw

----- Original Message -----

Quoted 7 lines

From: "Xiaoguang Wang" <[email protected]>
To: [email protected]
Sent: Thursday, 26 December, 2013 7:23:01 AM
Subject: [LTP] [PATCH 2/2] semop/semop02.c: add ERANGE error value test

Looks good to me:

I also ran it on RHEL 5.3/6.5/7 Beta and didn't see any issues.

Regards,
Jan

Quoted 83 lines
---
 testcases/kernel/syscalls/ipc/semop/semop02.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/ipc/semop/semop02.c +17 -5
index 08fc43c..b2ed38c 100644
@@ -19,7 +19,7 @@
 
 /*
  * DESCRIPTION
- *	semop02 - test for E2BIG, EACCES, EFAULT and EINVAL errors
+ *	semop02 - test for E2BIG, EACCES, EFAULT, EINVAL and ERANGE errors
  *
  * HISTORY
  *	03/2001 - Written by Wayne Boyer
@@ -29,6 +29,7 @@
  *        conflict with the key from another task.
  */
 
+#define _GNU_SOURCE
 #include <pwd.h>
 #include "test.h"
 #include "safe_macros.h"
@@ -38,7 +39,7 @@ char *TCID = "semop02";
 
 static void semop_verify(int i);
 
-static int exp_enos[] = { E2BIG, EACCES, EFAULT, EINVAL, 0 };
+static int exp_enos[] = { E2BIG, EACCES, EFAULT, EINVAL, ERANGE, 0 };
 int sem_id_1 = -1;	/* a semaphore set with read & alter permissions */
 int sem_id_2 = -1;	/* a semaphore set without read & alter permissions */
 int bad_id = -1;
@@ -50,7 +51,6 @@ int badbuf = -1;
 #define NSOPS	5		/* a resonable number of operations */
 #define	BIGOPS	1024		/* a value that is too large for the number */
 				/* of semop operations that are permitted   */
-
 struct test_case_t {
 	int *semid;
 	struct sembuf *t_sbuf;
@@ -61,7 +61,8 @@ struct test_case_t {
 	{&sem_id_2, (struct sembuf *)&s_buf, NSOPS, EACCES},
 	{&sem_id_1, (struct sembuf *)-1, NSOPS, EFAULT},
 	{&sem_id_1, (struct sembuf *)&s_buf, 0, EINVAL},
-	{&bad_id, (struct sembuf *)&s_buf, NSOPS, EINVAL}
+	{&bad_id, (struct sembuf *)&s_buf, NSOPS, EINVAL},
+	{&sem_id_1, (struct sembuf *)&s_buf, 1, ERANGE}
 };
 
 int TST_TOTAL = ARRAY_SIZE(TC);
@@ -94,6 +95,8 @@ void setup(void)
 	char nobody_uid[] = "nobody";
 	struct passwd *ltpuser;
 	key_t semkey2;
+	struct seminfo ipc_buf;
+	union semun arr;
 
 	tst_require_root(NULL);
 
@@ -127,6 +130,16 @@ void setup(void)
 		tst_brkm(TBROK | TERRNO, cleanup,
 			 "couldn't create semaphore in setup");
 	}
+
+	arr.ipc_buf = &ipc_buf;
+	if (semctl(sem_id_1, 0, IPC_INFO, arr) == -1)
+		tst_brkm(TBROK | TERRNO, cleanup, "semctl() IPC_INFO failed");
+
+	/* for ERANGE errno test */
+	arr.val = 1;
+	s_buf[0].sem_op = ipc_buf.semvmx;
+	if (semctl(sem_id_1, 0, SETVAL, arr) == -1)
+		tst_brkm(TBROK | TERRNO, cleanup, "semctl() SETVAL failed");
 }
 
 static void semop_verify(int i)
--

1.8.2.1

Quoted 12 lines

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Applied
#2 lore raw
In reply to Xiaoguang Wang
Quoted 4 lines · Xiaoguang Wang
---
 testcases/kernel/syscalls/ipc/semop/semop02.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

Applied, thank you.

Wanlong Gao

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list