@@ -28,5 +28,3 @@ pipeio_8 pipeio -T pipeio_8 -c 5 -s 5000 -i 10 -u -f x80
# spawns 5 children to write 10 chunks of 5000 bytes to an unnamed pipe
# using non-blocking I/O
-sem01 sem01
-sem02 sem02
@@ -1239,6 +1239,8 @@ semget06 semget06
semop01 semop01
semop02 semop02
semop03 semop03
+semop04 semop04
+semop05 semop05
send01 send01
send02 send02
deleted file mode 100644
@@ -1,2 +0,0 @@
-/sem01
-/sem02
deleted file mode 100644
@@ -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
@@ -1,3 +1,5 @@
/semop01
/semop02
/semop03
+/semop04
+/semop05
@@ -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
similarity index 100%
rename from testcases/kernel/ipc/semaphore/sem01.c
rename to testcases/kernel/syscalls/ipc/semop/semop04.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/ipc | 2 -- 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 8 files changed, 8 insertions(+), 35 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%)