Skip to contentSkip to conversation

ipc/msgrcv0*: cleanup && convert to new API

PATCH Superseded Yang Xu 2 participants 5 messages Jun 24, 2020 – Aug 11, 2020

lore
Share & tools
lore

Yang Xu

author
#0 lore raw

PATCH 1/1 ipc/msgrcv0*: cleanup && convert to new API

1) The msgrcv03,04 was merged into msgrcv02
2) take use of IPC related macros
3) test msgrcv08 on 64bit machine

---
 runtest/syscalls                              |   2 -
 .../kernel/syscalls/ipc/msgrcv/.gitignore     |   2 -
 testcases/kernel/syscalls/ipc/msgrcv/Makefile |   5 +-
 .../kernel/syscalls/ipc/msgrcv/msgrcv01.c     | 231 +++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv02.c     | 266 ++++++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv03.c     | 162 -----------
 .../kernel/syscalls/ipc/msgrcv/msgrcv04.c     | 181 ------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv05.c     | 240 ++++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv06.c     | 248 ++++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv07.c     | 209 +++++---------
 .../kernel/syscalls/ipc/msgrcv/msgrcv08.c     | 118 +++-----
 11 files changed, 344 insertions(+), 1320 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
 delete mode 100644 testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
runtest/syscalls +0 -2
index ee7e2a0d2..15cc8cc00 100644
@@ -810,8 +810,6 @@ msgget03 msgget03
 
 msgrcv01 msgrcv01
 msgrcv02 msgrcv02
-msgrcv03 msgrcv03
-msgrcv04 msgrcv04
 msgrcv05 msgrcv05
 msgrcv06 msgrcv06
 msgrcv07 msgrcv07
testcases/kernel/syscalls/ipc/msgrcv/.gitignore +0 -2
index 203464f5f..0596ee00f 100644
@@ -1,7 +1,5 @@
 /msgrcv01
 /msgrcv02
-/msgrcv03
-/msgrcv04
 /msgrcv05
 /msgrcv06
 /msgrcv07
testcases/kernel/syscalls/ipc/msgrcv/Makefile +2 -3
index f62cd1f48..56cdb6417 100644
@@ -3,10 +3,9 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpipc
+LTPLIBS = ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
-
-LDLIBS  += -lltpipc
+LDLIBS += -lltpnewipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c +38 -193

248 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c +87 -179

291 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c deleted +0 -162

162 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c deleted +0 -181

181 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c +59 -181

265 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c +49 -199

268 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c +69 -140

241 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c +40 -78

141 lines not on this page · raw message

Signature · 1 line
2.23.0
author
#1 lore raw

PATCH v2 1/1 ipc/msgrcv0*: cleanup && convert to new API

1) The msgrcv03,04 was merged into msgrcv02
2) take use of IPC related macros
3) test msgrcv08 on 64bit machine

---
v1->v2:
1. modify msgrcv02.c code and move msgget in do_test to avoid error when using -i parameters
2. modify msgrcv05.c code and remove duplicated SAFE_SIGNAL(SIGHUP, sighandler) function
3. remove msgrcv03,04 tag in syscalls-ipc

 runtest/syscalls                              |   2 -
 runtest/syscalls-ipc                          |   2 -
 .../kernel/syscalls/ipc/msgrcv/.gitignore     |   2 -
 testcases/kernel/syscalls/ipc/msgrcv/Makefile |   5 +-
 .../kernel/syscalls/ipc/msgrcv/msgrcv01.c     | 231 +++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv02.c     | 268 ++++++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv03.c     | 162 -----------
 .../kernel/syscalls/ipc/msgrcv/msgrcv04.c     | 181 ------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv05.c     | 240 ++++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv06.c     | 248 ++++------------
 .../kernel/syscalls/ipc/msgrcv/msgrcv07.c     | 209 +++++---------
 .../kernel/syscalls/ipc/msgrcv/msgrcv08.c     | 118 +++-----
 12 files changed, 345 insertions(+), 1323 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
 delete mode 100644 testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
runtest/syscalls +0 -2
index 819e8d8ee..9d3808d66 100644
@@ -811,8 +811,6 @@ msgget03 msgget03
 
 msgrcv01 msgrcv01
 msgrcv02 msgrcv02
-msgrcv03 msgrcv03
-msgrcv04 msgrcv04
 msgrcv05 msgrcv05
 msgrcv06 msgrcv06
 msgrcv07 msgrcv07
runtest/syscalls-ipc +0 -2
index c3a35896c..61743be01 100644
@@ -15,8 +15,6 @@ msgget03 msgget03
 
 msgrcv01 msgrcv01
 msgrcv02 msgrcv02
-msgrcv03 msgrcv03
-msgrcv04 msgrcv04
 msgrcv05 msgrcv05
 msgrcv06 msgrcv06
 msgrcv07 msgrcv07
testcases/kernel/syscalls/ipc/msgrcv/.gitignore +0 -2
index 203464f5f..0596ee00f 100644
@@ -1,7 +1,5 @@
 /msgrcv01
 /msgrcv02
-/msgrcv03
-/msgrcv04
 /msgrcv05
 /msgrcv06
 /msgrcv07
testcases/kernel/syscalls/ipc/msgrcv/Makefile +2 -3
index f62cd1f48..56cdb6417 100644
@@ -3,10 +3,9 @@
 
 top_srcdir              ?= ../../../../..
 
-LTPLIBS = ltpipc
+LTPLIBS = ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
-
-LDLIBS  += -lltpipc
+LDLIBS += -lltpnewipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c +38 -193

248 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c +89 -179

293 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c deleted +0 -162

162 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c deleted +0 -181

181 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c +58 -182

264 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c +49 -199

268 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c +69 -140

241 lines not on this page · raw message

testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c +40 -78

141 lines not on this page · raw message

Signature · 1 line
2.23.0
#2 lore raw

PATCH v2 1/1 ipc/msgrcv0*: cleanup && convert to new API

Hi!
I will have a look later on. Just FYI I'm nearly done cleaning up and fixing shmctl() testcase.

Signature · 2 lines
Cyril Hrubis
[email protected]
author
#3 lore raw

PATCH v2 1/1 ipc/msgrcv0*: cleanup && convert to new API

Hi Cyril

Quoted 3 lines

Hi!
I will have a look later on. Just FYI I'm nearly done cleaning up and fixing shmctl() testcase.

That't great. Also, I plan to cleanup other ipc test cases so that we can remove old ipc libs in ltp.

Best Regards
Yang Xu

Quoted 1 line
#4 lore raw

PATCH v2 1/1 ipc/msgrcv0*: cleanup && convert to new API

In reply to Yang Xu

Hi!
Good work, applied with a minor changes, thanks.

* Used exit() instead of _exit() unless in signal handler

* Added linux-git tag to struct tst_test for msgrcv08

Signature · 2 lines
Cyril Hrubis
[email protected]