@@ -19,5 +19,6 @@
top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
-
+include $(abs_srcdir)/./Makefile.inc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
+$(MAKE_TARGETS): %: %.o ../swapon/libswapon.o
new file mode 100644
@@ -0,0 +1,6 @@
+LIBDIR += ../swapon/
+LIBSWAPON := $(LIBDIR)/libswapon.o
+$(LIBSWAPON):
+ $(MAKE) -C $(LIBDIR)
+CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
+LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include "config.h"
#include "lapi/syscalls.h"
+#include "../swapon/libswapon.h"
static void setup(void);
static void cleanup(void);
@@ -86,14 +87,7 @@ static void setup(void)
tst_tmpdir();
- switch ((fs_type = tst_fs_type(cleanup, "."))) {
- case TST_NFS_MAGIC:
- case TST_TMPFS_MAGIC:
- tst_brkm(TCONF, cleanup,
- "Cannot do swapoff on a file on %s filesystem",
- tst_fs_type_name(fs_type));
- break;
- }
+ is_swap_supported(cleanup, "./tstswap");
if (!tst_fs_has_free(NULL, ".", 64, TST_MB)) {
tst_brkm(TBROK, cleanup,
@@ -138,14 +138,7 @@ static void setup(void)
tst_tmpdir();
- switch ((type = tst_fs_type(cleanup, "."))) {
- case TST_NFS_MAGIC:
- case TST_TMPFS_MAGIC:
- tst_brkm(TCONF, cleanup,
- "Cannot do swapoff on a file on %s filesystem",
- tst_fs_type_name(type));
- break;
- }
+ is_swap_supported(cleanup, "./tstswap");
if (!tst_fs_has_free(NULL, ".", 1, TST_KB)) {
tst_brkm(TBROK, cleanup,
Of swap operations. Change Makefile to use functions from ../swapon/libswapon.c Signed-off-by: Murphy Zhou <xzhou@redhat.com> --- testcases/kernel/syscalls/swapoff/Makefile | 3 ++- testcases/kernel/syscalls/swapoff/Makefile.inc | 6 ++++++ testcases/kernel/syscalls/swapoff/swapoff01.c | 10 ++-------- testcases/kernel/syscalls/swapoff/swapoff02.c | 9 +-------- 4 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 testcases/kernel/syscalls/swapoff/Makefile.inc