ltp: Fix determinism issue
PATCH 1/2 ltp: Fix determinism issue
There was still a remaining issue with reporoducibility based upon the make version from the host system. Some versions added whitespace for XXX+=<tab> (e.g. 4.1) and some versions do not (e.g. 4.3).
Replace the determinism patches with those submitted upstream both for this issue and the previous one.
The LC_ALL setting for sort is dropped as it didn't fix an issue as hoped.
Signed-off-by Richard Purdie <[email protected]>
--- ...uite-generate-makefiles.sh-Avoid-inc.patch | 40 +++ ...le-Avoid-wildcard-determinism-issues.patch | 310 ++++++++++++++++++ .../ltp/ltp/determinism2.patch | 291 ---------------- meta/recipes-extended/ltp/ltp_20210121.bb | 7 +- 4 files changed, 354 insertions(+), 294 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch create mode 100644 meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch delete mode 100644 meta/recipes-extended/ltp/ltp/determinism2.patch
meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Tue, 9 Mar 2021 15:21:11 +0000 +Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid + inconsistencies with make version + +With make 4.1, INSTALL_TARGETS+=<tab> will add a space to the variable whereas +with make 4.3, it will not. This leads to differing run.sh files in installed +in packages which is undesireable. If tests is empty we don't have to add +the line to the makefiles at all which seems like the easiest way to +avoid the differences in make behaviour. + +Signed-off-by: Richard Purdie <[email protected]> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021386.html] + +--- + .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +index 200a631db..4b3aaa4a0 100755 +--- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh ++++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +@@ -148,8 +148,12 @@ EOF + + fi + +- cat >> "$makefile.2" <<EOF ++ if [ ! -z "${tests}" ]; then ++ cat >> "$makefile.2" <<EOF + INSTALL_TARGETS+= ${tests} ++EOF ++ fi ++ cat >> "$makefile.2" <<EOF + MAKE_TARGETS+= ${targets} + + EOF +-- +2.27.0 +
meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch new file +310 -0
310 lines not on this page · raw message
meta/recipes-extended/ltp/ltp/determinism2.patch deleted +0 -291
291 lines not on this page · raw message
meta/recipes-extended/ltp/ltp_20210121.bb +4 -3
@@ -30,8 +30,8 @@ CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb" # remove at next version upgrade or when output changes -PR = "r3" -HASHEQUIV_HASH_VERSION .= ".3" +PR = "r4" +HASHEQUIV_HASH_VERSION .= ".4" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \
@@ -39,7 +39,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-Add-more-musl-exclusions.patch \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ file://determinism.patch \ - file://determinism2.patch \ + file://0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch \ + file://0002-Makefile-Avoid-wildcard-determinism-issues.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.27.0
PATCH 2/2 ltp: Fix libswapon issue properly
Replace the libswapon reproducibility workaround with the solution preferred by upstream.
Signed-off-by Richard Purdie <[email protected]>
--- ...-swapoff-Move-common-library-to-libs.patch | 133 +++++++ meta/recipes-extended/ltp/ltp/libswapon.patch | 368 ++++++++++++++++++ meta/recipes-extended/ltp/ltp_20210121.bb | 9 +- 3 files changed, 502 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch create mode 100644 meta/recipes-extended/ltp/ltp/libswapon.patch
meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch new file +133 -0
@@ -0,0 +1,133 @@ +From 0653f1d809d0cc13f84facb9d2d82d984ac4d0ac Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +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 <[email protected]> +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 <[email protected]> ++ ++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 +
meta/recipes-extended/ltp/ltp/libswapon.patch new file +368 -0
368 lines not on this page · raw message
meta/recipes-extended/ltp/ltp_20210121.bb +1 -8
@@ -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
Signature · 1 line
2.27.0