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

ltp: Fixing determinism issues

Browse Source 
Add a patch adding sorting to a couple of points in the Makefiles
which removes most of the determinism issues in ltp.

Build swapon before the main build to ensure libswapon.o is built
deterministically as it races with swapoff.

All issues reported on the upstream mailing list.

(From OE-Core rev: 0f51f9a37e5d058bce28cfe7b9a32a895f83c091)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-03-01 21:28:58 +00:00
parent 8784e75a71
commit e2bf02e7bd
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/lib/oeqa/selftest/cases/reproducible.py
View File

@@ -34,7 +34,6 @@ exclude_packages = [
'go-runtime',
'go_',
'go-',
'ltp',
'meson',
'ovmf-shell-efi',
'perf',

43
meta/recipes-extended/ltp/ltp/determinism.patch Normal file
View File

@@ -0,0 +1,43 @@
open_posix_testsuite/generate-makefiles.sh: Fix determinism issue
Currently the list of tests is generated by the order of the files found
within the directories. This results in differences in the run.sh and
Makefiles. Within Yocto Project this results in differing target
test packages. The fix is simple, just sort the output from locate-test.
mk/lib.mk: Sort wildcard expansion for determinism
The order of the objects linked into libltp.a varies depending on the
order of the files found on disk. This results in most ltp binaries
differing depending on that order too.
Sort the wildcard expansion of *.c which leads to reproducible binaries.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021272.html http://lists.linux.it/pipermail/ltp/2021-March/021273.html]
Index: git/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
===================================================================
--- git.orig/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
+++ git/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
@@ -24,7 +24,7 @@ generate_locate_test_makefile() {
echo "Generating $maketype Makefiles"
- locate-test --$maketype | sed -e 's,^./,,g' > make-gen.$maketype
+ locate-test --$maketype | sed -e 's,^./,,g' | sort > make-gen.$maketype
generate_makefiles make-gen.$maketype $*
Index: git/include/mk/lib.mk
===================================================================
--- git.orig/include/mk/lib.mk
+++ git/include/mk/lib.mk
@@ -50,6 +50,7 @@ endif
MAKE_TARGETS += $(LIB)
LIBSRCS ?= $(wildcard $(abs_srcdir)/*.c)
+LIBSRCS := $(sort $(LIBSRCS))
LIBSRCS := $(abspath $(LIBSRCS))
LIBSRCS := $(subst $(abs_srcdir)/,,$(wildcard $(LIBSRCS)))
LIBSRCS := $(filter-out $(FILTER_OUT_LIBSRCS),$(LIBSRCS))

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

@@ -29,11 +29,16 @@ CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
# remove at next version upgrade or when output changes
PR = "r1"
HASHEQUIV_HASH_VERSION .= ".1"
SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0001-build-Add-option-to-select-libc-implementation.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-Remove-OOM-tests-from-runtest-mm.patch \
file://determinism.patch \
"
S = "${WORKDIR}/git"
@@ -51,6 +56,14 @@ 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