similarity index 100%
rename from testcases/kernel/syscalls/swapon/libswapon.h
rename to include/libswapon.h
new file mode 100644
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) Richard Purdie <richard.purdie@linuxfoundation.org>
+
+top_srcdir ?= ../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INTERNAL_LIB := libltpswapon.a
+
+include $(top_srcdir)/include/mk/lib.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
similarity index 100%
rename from testcases/kernel/syscalls/swapon/libswapon.c
rename to libs/libltpswapon/libswapon.c
@@ -3,7 +3,10 @@
top_srcdir ?= ../../../..
+LTPLIBS = ltpswapon
+
include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/./Makefile.inc
+
+LTPLDLIBS = -lltpswapon
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
-$(MAKE_TARGETS): %: ../swapon/libswapon.o
deleted file mode 100644
@@ -1,6 +0,0 @@
-LIBDIR += ../swapon/
-LIBSWAPON := $(LIBDIR)/libswapon.o
-$(LIBSWAPON):
- $(MAKE) -C $(LIBDIR)
-CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
-LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "config.h"
#include "lapi/syscalls.h"
-#include "../swapon/libswapon.h"
+#include "libswapon.h"
static void setup(void);
static void cleanup(void);
@@ -33,7 +33,7 @@
#include "test.h"
#include "lapi/syscalls.h"
#include "safe_macros.h"
-#include "../swapon/libswapon.h"
+#include "libswapon.h"
static void setup(void);
static void cleanup(void);
@@ -8,10 +8,10 @@ endif
top_srcdir ?= ../../../..
+LTPLIBS = ltpswapon
+
include $(top_srcdir)/include/mk/testcases.mk
-FILTER_OUT_MAKE_TARGETS := libswapon
+LTPLDLIBS = -lltpswapon
include $(top_srcdir)/include/mk/generic_leaf_target.mk
-
-$(MAKE_TARGETS): %: libswapon.o
There is a race/determinism issue with libswapon currently as depending on which makefile path builds it, the debug paths may be "../swapon/libswapon.c" or "libswapon.c". To avoid the determinism issue, move libswapon to libs/ and use it from the shared location. The header is moved to the common includes directory to match and the Makefile.inc fragment can be dropped. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- .../kernel/syscalls/swapon => include}/libswapon.h | 0 libs/libltpswapon/Makefile | 12 ++++++++++++ .../swapon => libs/libltpswapon}/libswapon.c | 0 testcases/kernel/syscalls/swapoff/Makefile | 7 +++++-- testcases/kernel/syscalls/swapoff/Makefile.inc | 6 ------ testcases/kernel/syscalls/swapoff/swapoff01.c | 2 +- testcases/kernel/syscalls/swapoff/swapoff02.c | 2 +- testcases/kernel/syscalls/swapon/Makefile | 6 +++--- 8 files changed, 22 insertions(+), 13 deletions(-) rename {testcases/kernel/syscalls/swapon => include}/libswapon.h (100%) create mode 100644 libs/libltpswapon/Makefile rename {testcases/kernel/syscalls/swapon => libs/libltpswapon}/libswapon.c (100%) delete mode 100644 testcases/kernel/syscalls/swapoff/Makefile.inc