| Message ID | 20230119132536.23209-1-wegao@suse.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1] Move semaphore/ tests to semop/ | expand |
Hi Wei, > There is no point in having two different directories with semop() > testcaes so it would make sense to move these two tests into the > syscalls/ipc/semop/ directory as semop04 and semop05. > So we move ipc/semaphore/ tests to syscalls/ipc/semop/. > Also update runtest files accordingly. testcases/kernel/ipc/semaphore/Makefile links with libpthread.so.0: LDLIBS += -lpthread Although it looks like only sem02.c uses pthread functions. https://man7.org/linux/man-pages/man7/pthreads.7.html testcases/kernel/syscalls/ipc/semop/Makefile links with ltp library libltpnewipc.a: LTPLDLIBS = -lltpnewipc which uses /proc/sysvipc/ https://man7.org/linux/man-pages/man7/sysvipc.7.html I'm not sure if it's good idea to mix both @Cyril any input? > +++ b/testcases/kernel/syscalls/ipc/semop/Makefile > @@ -8,5 +8,6 @@ LTPLIBS = ltpnewipc > include $(top_srcdir)/include/mk/testcases.mk > LTPLDLIBS = -lltpnewipc > +LDLIBS += -lpthread If it's ok to merge them into single directory, it'd be better to specify used libraries for files which need them. e.g.: semop01: LTPLDLIBS = -lltpnewipc semop02: LTPLDLIBS = -lltpnewipc semop03: LTPLDLIBS = -lltpnewipc semop05: LDLIBS += -lpthread Kind regards, Petr
diff --git a/runtest/syscalls b/runtest/syscalls index ae37a1192..54cbc6ece 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1239,6 +1239,8 @@ semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05 send01 send01 send02 send02 diff --git a/testcases/kernel/ipc/semaphore/.gitignore b/testcases/kernel/ipc/semaphore/.gitignore deleted file mode 100644 index 944e5ca1e..000000000 --- a/testcases/kernel/ipc/semaphore/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/sem01 -/sem02 diff --git a/testcases/kernel/ipc/semaphore/Makefile b/testcases/kernel/ipc/semaphore/Makefile deleted file mode 100644 index 9ab85745d..000000000 --- a/testcases/kernel/ipc/semaphore/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# testcases/kernel/ipc/semaphore Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CPPFLAGS += -I../include -LDLIBS += -lpthread - -include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/ipc/semop/.gitignore b/testcases/kernel/syscalls/ipc/semop/.gitignore index bb57f08af..cc67b1862 100644 --- a/testcases/kernel/syscalls/ipc/semop/.gitignore +++ b/testcases/kernel/syscalls/ipc/semop/.gitignore @@ -1,3 +1,5 @@ /semop01 /semop02 /semop03 +/semop04 +/semop05 diff --git a/testcases/kernel/syscalls/ipc/semop/Makefile b/testcases/kernel/syscalls/ipc/semop/Makefile index 6b2b26d05..8ee2f7fe6 100644 --- a/testcases/kernel/syscalls/ipc/semop/Makefile +++ b/testcases/kernel/syscalls/ipc/semop/Makefile @@ -8,5 +8,6 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk LTPLDLIBS = -lltpnewipc +LDLIBS += -lpthread include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/ipc/semaphore/sem01.c b/testcases/kernel/syscalls/ipc/semop/semop04.c similarity index 100% rename from testcases/kernel/ipc/semaphore/sem01.c rename to testcases/kernel/syscalls/ipc/semop/semop04.c diff --git a/testcases/kernel/ipc/semaphore/sem02.c b/testcases/kernel/syscalls/ipc/semop/semop05.c similarity index 100% rename from testcases/kernel/ipc/semaphore/sem02.c rename to testcases/kernel/syscalls/ipc/semop/semop05.c
There is no point in having two different directories with semop() testcaes so it would make sense to move these two tests into the syscalls/ipc/semop/ directory as semop04 and semop05. So we move ipc/semaphore/ tests to syscalls/ipc/semop/. Also update runtest files accordingly. Signed-off-by: Wei Gao <wegao@suse.com> --- runtest/syscalls | 2 ++ testcases/kernel/ipc/semaphore/.gitignore | 2 -- testcases/kernel/ipc/semaphore/Makefile | 30 ------------------- .../kernel/syscalls/ipc/semop/.gitignore | 2 ++ testcases/kernel/syscalls/ipc/semop/Makefile | 1 + .../sem01.c => syscalls/ipc/semop/semop04.c} | 0 .../sem02.c => syscalls/ipc/semop/semop05.c} | 0 7 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 testcases/kernel/ipc/semaphore/.gitignore delete mode 100644 testcases/kernel/ipc/semaphore/Makefile rename testcases/kernel/{ipc/semaphore/sem01.c => syscalls/ipc/semop/semop04.c} (100%) rename testcases/kernel/{ipc/semaphore/sem02.c => syscalls/ipc/semop/semop05.c} (100%)