mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ltp: Fix libswapon issue properly

Browse Source 
Replace the libswapon reproducibility workaround with the solution
preferred by upstream.

(From OE-Core rev: 5fc7d4a4c428d5be7103d8e9345d23038dae4247)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-03-09 14:25:42 +00:00
parent 7c8a944c47
commit 618b2ce5ca
3 changed files with 502 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch Normal file
View File

@@ -0,0 +1,133 @@
From 0653f1d809d0cc13f84facb9d2d82d984ac4d0ac Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 9 Mar 2021 15:25:16 +0000
Subject: [PATCH 3/3] syscalls/swapon/swapoff: Move common library to libs/
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>
Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021387.html]
---
.../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
diff --git a/testcases/kernel/syscalls/swapon/libswapon.h b/include/libswapon.h
similarity index 100%
rename from testcases/kernel/syscalls/swapon/libswapon.h
rename to include/libswapon.h
diff --git a/libs/libltpswapon/Makefile b/libs/libltpswapon/Makefile
new file mode 100644
index 000000000..8f738338b
--- /dev/null
+++ b/libs/libltpswapon/Makefile
@@ -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
diff --git a/testcases/kernel/syscalls/swapon/libswapon.c b/libs/libltpswapon/libswapon.c
similarity index 100%
rename from testcases/kernel/syscalls/swapon/libswapon.c
rename to libs/libltpswapon/libswapon.c
diff --git a/testcases/kernel/syscalls/swapoff/Makefile b/testcases/kernel/syscalls/swapoff/Makefile
index fbfbe0441..a74374605 100644
--- a/testcases/kernel/syscalls/swapoff/Makefile
+++ b/testcases/kernel/syscalls/swapoff/Makefile
@@ -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
diff --git a/testcases/kernel/syscalls/swapoff/Makefile.inc b/testcases/kernel/syscalls/swapoff/Makefile.inc
deleted file mode 100644
index 65350cbeb..000000000
--- a/testcases/kernel/syscalls/swapoff/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBDIR += ../swapon/
-LIBSWAPON := $(LIBDIR)/libswapon.o
-$(LIBSWAPON):
- $(MAKE) -C $(LIBDIR)
-CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
-LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c
index e115269c0..87a217a89 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff01.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff01.c
@@ -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);
diff --git a/testcases/kernel/syscalls/swapoff/swapoff02.c b/testcases/kernel/syscalls/swapoff/swapoff02.c
index 8954f975f..60cd66c26 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff02.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff02.c
@@ -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);
diff --git a/testcases/kernel/syscalls/swapon/Makefile b/testcases/kernel/syscalls/swapon/Makefile
index 97113a447..57ec45d48 100644
--- a/testcases/kernel/syscalls/swapon/Makefile
+++ b/testcases/kernel/syscalls/swapon/Makefile
@@ -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
--
2.27.0

368
meta/recipes-extended/ltp/ltp/libswapon.patch Normal file
View File

@@ -0,0 +1,368 @@
Index: git/libs/libltpswapon/Makefile
===================================================================
--- /dev/null
+++ git/libs/libltpswapon/Makefile
@@ -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
Index: git/libs/libltpswapon/libswapon.c
===================================================================
--- /dev/null
+++ git/libs/libltpswapon/libswapon.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+ *
+ * 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 would 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 the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
+ *
+ */
+
+#include <errno.h>
+#include "lapi/syscalls.h"
+#include "test.h"
+#include "libswapon.h"
+
+/*
+ * Make a swap file
+ */
+int make_swapfile(void (cleanup)(void), const char *swapfile, int safe)
+{
+ if (!tst_fs_has_free(NULL, ".", sysconf(_SC_PAGESIZE) * 10,
+ TST_BYTES)) {
+ tst_brkm(TBROK, cleanup,
+ "Insufficient disk space to create swap file");
+ }
+
+ /* create file */
+ if (tst_fill_file(swapfile, 0,
+ sysconf(_SC_PAGESIZE), 10) != 0) {
+ tst_brkm(TBROK, cleanup, "Failed to create swapfile");
+ }
+
+ /* make the file swapfile */
+ const char *argv[2 + 1];
+ argv[0] = "mkswap";
+ argv[1] = swapfile;
+ argv[2] = NULL;
+
+ return tst_cmd(cleanup, argv, "/dev/null", "/dev/null", safe);
+}
+
+/*
+ * Check swapon/swapoff support status of filesystems or files
+ * we are testing on.
+ */
+void is_swap_supported(void (cleanup)(void), const char *filename)
+{
+ int fibmap = tst_fibmap(filename);
+ long fs_type = tst_fs_type(cleanup, filename);
+ const char *fstype = tst_fs_type_name(fs_type);
+
+ int ret = make_swapfile(NULL, filename, 1);
+ if (ret != 0) {
+ if (fibmap == 1) {
+ tst_brkm(TCONF, cleanup,
+ "mkswap on %s not supported", fstype);
+ } else {
+ tst_brkm(TFAIL, cleanup,
+ "mkswap on %s failed", fstype);
+ }
+ }
+
+ TEST(ltp_syscall(__NR_swapon, filename, 0));
+ if (TEST_RETURN == -1) {
+ if (fibmap == 1 && errno == EINVAL) {
+ tst_brkm(TCONF, cleanup,
+ "Swapfile on %s not implemented", fstype);
+ } else {
+ tst_brkm(TFAIL | TERRNO, cleanup,
+ "swapon on %s failed", fstype);
+ }
+ }
+
+ TEST(ltp_syscall(__NR_swapoff, filename, 0));
+ if (TEST_RETURN == -1) {
+ tst_brkm(TFAIL | TERRNO, cleanup,
+ "swapoff on %s failed", fstype);
+ }
+}
Index: git/testcases/kernel/syscalls/swapoff/Makefile
===================================================================
--- git.orig/testcases/kernel/syscalls/swapoff/Makefile
+++ git/testcases/kernel/syscalls/swapoff/Makefile
@@ -3,7 +3,11 @@
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
+
Index: git/testcases/kernel/syscalls/swapoff/Makefile.inc
===================================================================
--- git.orig/testcases/kernel/syscalls/swapoff/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBDIR += ../swapon/
-LIBSWAPON := $(LIBDIR)/libswapon.o
-$(LIBSWAPON):
- $(MAKE) -C $(LIBDIR)
-CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
-LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
Index: git/testcases/kernel/syscalls/swapon/Makefile
===================================================================
--- git.orig/testcases/kernel/syscalls/swapon/Makefile
+++ git/testcases/kernel/syscalls/swapon/Makefile
@@ -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
Index: git/testcases/kernel/syscalls/swapon/libswapon.c
===================================================================
--- git.orig/testcases/kernel/syscalls/swapon/libswapon.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
- *
- * 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 would 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 the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
- *
- */
-
-#include <errno.h>
-#include "lapi/syscalls.h"
-#include "test.h"
-#include "libswapon.h"
-
-/*
- * Make a swap file
- */
-int make_swapfile(void (cleanup)(void), const char *swapfile, int safe)
-{
- if (!tst_fs_has_free(NULL, ".", sysconf(_SC_PAGESIZE) * 10,
- TST_BYTES)) {
- tst_brkm(TBROK, cleanup,
- "Insufficient disk space to create swap file");
- }
-
- /* create file */
- if (tst_fill_file(swapfile, 0,
- sysconf(_SC_PAGESIZE), 10) != 0) {
- tst_brkm(TBROK, cleanup, "Failed to create swapfile");
- }
-
- /* make the file swapfile */
- const char *argv[2 + 1];
- argv[0] = "mkswap";
- argv[1] = swapfile;
- argv[2] = NULL;
-
- return tst_cmd(cleanup, argv, "/dev/null", "/dev/null", safe);
-}
-
-/*
- * Check swapon/swapoff support status of filesystems or files
- * we are testing on.
- */
-void is_swap_supported(void (cleanup)(void), const char *filename)
-{
- int fibmap = tst_fibmap(filename);
- long fs_type = tst_fs_type(cleanup, filename);
- const char *fstype = tst_fs_type_name(fs_type);
-
- int ret = make_swapfile(NULL, filename, 1);
- if (ret != 0) {
- if (fibmap == 1) {
- tst_brkm(TCONF, cleanup,
- "mkswap on %s not supported", fstype);
- } else {
- tst_brkm(TFAIL, cleanup,
- "mkswap on %s failed", fstype);
- }
- }
-
- TEST(ltp_syscall(__NR_swapon, filename, 0));
- if (TEST_RETURN == -1) {
- if (fibmap == 1 && errno == EINVAL) {
- tst_brkm(TCONF, cleanup,
- "Swapfile on %s not implemented", fstype);
- } else {
- tst_brkm(TFAIL | TERRNO, cleanup,
- "swapon on %s failed", fstype);
- }
- }
-
- TEST(ltp_syscall(__NR_swapoff, filename, 0));
- if (TEST_RETURN == -1) {
- tst_brkm(TFAIL | TERRNO, cleanup,
- "swapoff on %s failed", fstype);
- }
-}
Index: git/testcases/kernel/syscalls/swapon/libswapon.h
===================================================================
--- git.orig/testcases/kernel/syscalls/swapon/libswapon.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
- *
- * 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 would 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 the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
- *
- */
-
-/*
- * Contains common content for all swapon tests
- */
-
-#ifndef __LIBSWAPON_H__
-#define __LIBSWAPON_H__
-
-/*
- * Make a swap file
- */
-int make_swapfile(void (cleanup)(void), const char *swapfile, int safe);
-
-/*
- * Check swapon/swapoff support status of filesystems or files
- * we are testing on.
- */
-void is_swap_supported(void (cleanup)(void), const char *filename);
-#endif /* __LIBSWAPON_H__ */
Index: git/testcases/kernel/syscalls/swapoff/swapoff01.c
===================================================================
--- git.orig/testcases/kernel/syscalls/swapoff/swapoff01.c
+++ git/testcases/kernel/syscalls/swapoff/swapoff01.c
@@ -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);
Index: git/testcases/kernel/syscalls/swapoff/swapoff02.c
===================================================================
--- git.orig/testcases/kernel/syscalls/swapoff/swapoff02.c
+++ git/testcases/kernel/syscalls/swapoff/swapoff02.c
@@ -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);
Index: git/include/libswapon.h
===================================================================
--- /dev/null
+++ git/include/libswapon.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+ *
+ * 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 would 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 the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
+ *
+ */
+
+/*
+ * Contains common content for all swapon tests
+ */
+
+#ifndef __LIBSWAPON_H__
+#define __LIBSWAPON_H__
+
+/*
+ * Make a swap file
+ */
+int make_swapfile(void (cleanup)(void), const char *swapfile, int safe);
+
+/*
+ * Check swapon/swapoff support status of filesystems or files
+ * we are testing on.
+ */
+void is_swap_supported(void (cleanup)(void), const char *filename);
+#endif /* __LIBSWAPON_H__ */

9
meta/recipes-extended/ltp/ltp_20210121.bb
View File

@@ -41,6 +41,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://determinism.patch \
file://0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch \
file://0002-Makefile-Avoid-wildcard-determinism-issues.patch \
file://0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch \
"
S = "${WORKDIR}/git"
@@ -58,14 +59,6 @@ EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite "
# ltp network/rpc test cases ftbfs when libtirpc is found
EXTRA_OECONF += " --without-tirpc "
do_compile_prepend() {
# Reported at http://lists.linux.it/pipermail/ltp/2021-March/021274.html
# Avoid a race over construction of libswapon.o which is built by swapon and swapoff
# but the object differs depending upon which one built it
# ("../swapon/libswapon.c" vs "libswapon.c" references)
make -C ${B}/testcases/kernel/syscalls/swapon/
}
do_install(){
install -d ${D}${prefix}/
oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install