| Message ID | 20230120010533.11202-1-wegao@suse.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [v2] Move semaphore/ tests to semop/ | expand |
Hello, Wei Gao via ltp <ltp@lists.linux.it> writes: > 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. Yes, true. However these tests are using the old API. It makes sense to move them and update to the new API at the same time. Maybe they even test the same things as the other tests, so they could be deduplicated. I like breaking things into small tasks, but this is actually too small. I think it would be better to convert and move one test at a time as well (in separate commits, but in the same patch series).
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..43afffb3f 100644 --- a/testcases/kernel/syscalls/ipc/semop/Makefile +++ b/testcases/kernel/syscalls/ipc/semop/Makefile @@ -7,6 +7,9 @@ LTPLIBS = ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -LTPLDLIBS = -lltpnewipc +semop01: LTPLDLIBS = -lltpnewipc +semop02: LTPLDLIBS = -lltpnewipc +semop03: LTPLDLIBS = -lltpnewipc +semop05: 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> --- v2->v1:Update Makefile give each case specific link option 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 | 5 +++- .../sem01.c => syscalls/ipc/semop/semop04.c} | 0 .../sem02.c => syscalls/ipc/semop/semop05.c} | 0 7 files changed, 8 insertions(+), 33 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%)