Skip to contentSkip to conversation

Remove libclone library from containers suite

PATCH In review Andrea Cervesato 2 participants 2 messages Sep 14, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Remove libclone library from containers suite

From: Andrea Cervesato <[email protected]>

---
 testcases/kernel/containers/Makefile          |  27 +---
 testcases/kernel/containers/Makefile.inc      |  45 ------
 testcases/kernel/containers/README            |   2 -
 testcases/kernel/containers/libclone/Makefile |  27 ----
 .../kernel/containers/libclone/libclone.c     | 142 ------------------
 .../kernel/containers/libclone/libclone.h     |  81 ----------
 testcases/kernel/containers/netns/Makefile    |   4 +-
 testcases/kernel/containers/pidns/Makefile    |   3 +-
 .../kernel/containers/pidns/pidns_helper.h    |  34 -----
 testcases/kernel/containers/userns/Makefile   |   1 -
 testcases/kernel/containers/utsname/Makefile  |   3 +-
 11 files changed, 5 insertions(+), 364 deletions(-)
 delete mode 100644 testcases/kernel/containers/Makefile.inc
 delete mode 100644 testcases/kernel/containers/libclone/Makefile
 delete mode 100644 testcases/kernel/containers/libclone/libclone.c
 delete mode 100644 testcases/kernel/containers/libclone/libclone.h
 delete mode 100644 testcases/kernel/containers/pidns/pidns_helper.h
testcases/kernel/containers/Makefile +1 -26
index 4285546e7..20d2424a5 100644
@@ -1,33 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (c) International Business Machines  Corp., 2007
+# Copyright (C) 2023 SUSE LLC Andrea Cervesato <[email protected]>
 
 top_srcdir		?= ../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
-
-LIBDIR			:= libclone
-
-FILTER_OUT_DIRS		:= $(LIBDIR)
-
-LIB			:= $(LIBDIR)/libclone.a
-
-LDLIBS			:= -ldl -lltp
-
-INSTALL_TARGETS		:= *.sh
-
-$(LIBDIR):
-	mkdir -p "$@"
-
-# Make the target the real lib so we don't have to deal with rebuilding this
-# every time the dependency is evaluated, like with PHONY rules.
-$(LIB): $(LIBDIR)
-	$(MAKE) -C $^ -f "$(abs_srcdir)/$(LIBDIR)/Makefile" all
-
-MAKE_DEPS		:= $(LIB)
-
-trunk-clean:: | lib-clean
-
-lib-clean:: $(LIBDIR)
-	$(MAKE) -C $^ -f "$(abs_srcdir)/$(LIBDIR)/Makefile" clean
-
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/kernel/containers/Makefile.inc deleted +0 -45

45 lines not on this page · raw message

testcases/kernel/containers/README +0 -2
index c99cacd98..df909e526 100644
@@ -44,7 +44,5 @@ posixmq/*
 	enabled in the kernel without SYSV IPC support.
 utsname/*
 	Contains all the testcases related to utsname tests.
-libclone/*
-	Contains the library API for clone() .
 netns/*
         Contains the testcases related to the network NS tests.
testcases/kernel/containers/libclone/Makefile deleted +0 -27
deleted file mode 100644
index 13af52b67..000000000
@@ -1,27 +0,0 @@
-################################################################################
-##                                                                            ##
-## Copyright (c) International Business Machines  Corp., 2007                 ##
-##                                                                            ##
-## 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    ##
-##                                                                            ##
-################################################################################
-
-top_srcdir		?= ../../../..
-
-include $(top_srcdir)/include/mk/testcases.mk
-
-INTERNAL_LIB		:= libclone.a
-
-include $(top_srcdir)/include/mk/lib.mk
testcases/kernel/containers/libclone/libclone.c deleted +0 -142

142 lines not on this page · raw message

testcases/kernel/containers/libclone/libclone.h deleted +0 -81

81 lines not on this page · raw message

testcases/kernel/containers/netns/Makefile +2 -2
index 3cc2b4ae7..a8edd31b8 100644
@@ -2,12 +2,12 @@
 # Copyright (c) International Business Machines  Corp., 2008
 # Author: Veerendra <[email protected]>
 # Copyright (c) 2015 Red Hat, Inc.
+# Copyright (C) 2023 SUSE LLC Andrea Cervesato <[email protected]>
 
 top_srcdir              ?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/../Makefile.inc
 
-LDLIBS                  := -lclone -lltp
+INSTALL_TARGETS		:= *.sh
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/containers/pidns/Makefile +1 -2
index 5f8383c3c..b99df9f74 100644
@@ -4,8 +4,7 @@
 top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/../Makefile.inc
 
-LDLIBS			:= -lpthread -lrt -lclone $(LDLIBS)
+LDLIBS			:= -lpthread -lrt $(LDLIBS)
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/containers/pidns/pidns_helper.h deleted +0 -34
deleted file mode 100644
index 3b356768f..000000000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) International Business Machines Corp., 2007
-* 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.
-*/
-
-#include "../libclone/libclone.h"
-#include "test.h"
-#include "safe_macros.h"
-
-static int dummy_child(void *v)
-{
-	(void) v;
-	return 0;
-}
-
-static int check_newpid(void)
-{
-	int pid, status;
-
-	pid = do_clone_unshare_test(T_CLONE, CLONE_NEWPID, dummy_child, NULL);
-	if (pid == -1)
-		tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWPID not supported");
-	SAFE_WAIT(NULL, &status);
-
-	return 0;
-}
testcases/kernel/containers/userns/Makefile +0 -1
index 018ab000b..cc1d14604 100644
@@ -19,7 +19,6 @@
 top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/../Makefile.inc
 
 LDLIBS			:= $(LDLIBS) $(CAP_LIBS)
 
testcases/kernel/containers/utsname/Makefile +1 -2
index 9c0158c01..603a3cd6e 100644
@@ -4,8 +4,7 @@
 top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/../Makefile.inc
 
-LDLIBS			:= -lclone $(LDLIBS)
+LDLIBS			:= $(LDLIBS)
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
Signature · 5 lines
2.35.3


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp