summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-05 23:20:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-06 22:34:20 +0000
commit001003eaaddb48e6942ef16deaf3ada6b578e714 (patch)
treefdcc12cb46b3dd203290d8b1c9995dbaee010648 /meta/recipes-extended/ltp
parentc8075ed8f157468849d3199c3671b84a6f08785d (diff)
downloadpoky-001003eaaddb48e6942ef16deaf3ada6b578e714.tar.gz
ltp: Fix another determinism issue
After the other fixes there remained occasional problems. Fix another makefile sorting problem affecting the disktest binary. (From OE-Core rev: 636f4d1f6ed8a95e3a583abc5904ab8dbc6184af) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r--meta/recipes-extended/ltp/ltp/determinism2.patch24
-rw-r--r--meta/recipes-extended/ltp/ltp_20210121.bb5
2 files changed, 27 insertions, 2 deletions
diff --git a/meta/recipes-extended/ltp/ltp/determinism2.patch b/meta/recipes-extended/ltp/ltp/determinism2.patch
new file mode 100644
index 0000000000..ab08e8e517
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/determinism2.patch
@@ -0,0 +1,24 @@
1testcases/kernel/io/disktest: Fix determinism issue
2
3The order of the objects linked into the test varies depending on the
4order of the files found on disk. This results in the disktest binary
5differing depending on that order.
6
7Sort the wildcard expansion of *.c which leads to reproducible binaries.
8
9Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10Upstream-Status: Pending
11
12Index: git/testcases/kernel/io/disktest/Makefile
13===================================================================
14--- git.orig/testcases/kernel/io/disktest/Makefile
15+++ git/testcases/kernel/io/disktest/Makefile
16@@ -209,7 +209,7 @@ LDLIBS += -lpthread
17
18 MAKE_TARGETS := disktest
19
20-OBJS := $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c))
21+OBJS := $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c)))
22
23 disktest-$(VER):
24 mkdir -p "$@"
diff --git a/meta/recipes-extended/ltp/ltp_20210121.bb b/meta/recipes-extended/ltp/ltp_20210121.bb
index 593f07087c..325574a50e 100644
--- a/meta/recipes-extended/ltp/ltp_20210121.bb
+++ b/meta/recipes-extended/ltp/ltp_20210121.bb
@@ -30,8 +30,8 @@ CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
30SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb" 30SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
31 31
32# remove at next version upgrade or when output changes 32# remove at next version upgrade or when output changes
33PR = "r1" 33PR = "r2"
34HASHEQUIV_HASH_VERSION .= ".1" 34HASHEQUIV_HASH_VERSION .= ".2"
35 35
36SRC_URI = "git://github.com/linux-test-project/ltp.git \ 36SRC_URI = "git://github.com/linux-test-project/ltp.git \
37 file://0001-build-Add-option-to-select-libc-implementation.patch \ 37 file://0001-build-Add-option-to-select-libc-implementation.patch \
@@ -39,6 +39,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
39 file://0001-Add-more-musl-exclusions.patch \ 39 file://0001-Add-more-musl-exclusions.patch \
40 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 40 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
41 file://determinism.patch \ 41 file://determinism.patch \
42 file://determinism2.patch \
42 " 43 "
43 44
44S = "${WORKDIR}/git" 45S = "${WORKDIR}/git"