diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-05 23:20:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-06 22:34:20 +0000 |
commit | 001003eaaddb48e6942ef16deaf3ada6b578e714 (patch) | |
tree | fdcc12cb46b3dd203290d8b1c9995dbaee010648 /meta/recipes-extended/ltp/ltp | |
parent | c8075ed8f157468849d3199c3671b84a6f08785d (diff) | |
download | poky-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/ltp')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/determinism2.patch | 24 |
1 files changed, 24 insertions, 0 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 @@ | |||
1 | testcases/kernel/io/disktest: Fix determinism issue | ||
2 | |||
3 | The order of the objects linked into the test varies depending on the | ||
4 | order of the files found on disk. This results in the disktest binary | ||
5 | differing depending on that order. | ||
6 | |||
7 | Sort the wildcard expansion of *.c which leads to reproducible binaries. | ||
8 | |||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Index: 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 "$@" | ||