summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/determinism2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/determinism2.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/determinism2.patch291
1 files changed, 0 insertions, 291 deletions
diff --git a/meta/recipes-extended/ltp/ltp/determinism2.patch b/meta/recipes-extended/ltp/ltp/determinism2.patch
deleted file mode 100644
index d786f4c2f9..0000000000
--- a/meta/recipes-extended/ltp/ltp/determinism2.patch
+++ /dev/null
@@ -1,291 +0,0 @@
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 "$@"
25Index: git/testcases/commands/ldd/datafiles/Makefile
26===================================================================
27--- git.orig/testcases/commands/ldd/datafiles/Makefile
28+++ git/testcases/commands/ldd/datafiles/Makefile
29@@ -21,7 +21,7 @@ CPPFLAGS += -fpic
30
31 INSTALL_TARGETS := ldd*.so lddfile.out
32
33-LDD_C_FILES := $(wildcard $(abs_srcdir)/lddfile*.c)
34+LDD_C_FILES := $(sort $(wildcard $(abs_srcdir)/lddfile*.c))
35 LDD_SO_FILES := $(patsubst $(abs_srcdir)/%.c,%.obj.so,$(LDD_C_FILES))
36 MAKE_TARGETS := lddfile.out
37 CLEAN_TARGETS += *.obj $(LDD_SO_FILES)
38Index: git/testcases/kernel/hotplug/memory_hotplug/Makefile
39===================================================================
40--- git.orig/testcases/kernel/hotplug/memory_hotplug/Makefile
41+++ git/testcases/kernel/hotplug/memory_hotplug/Makefile
42@@ -31,6 +31,7 @@ LDLIBS := $(filter-out -lltp,$(LDLIBS))
43
44 MAKE_TARGETS := memtoy
45
46-memtoy: $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c))
47+memtoy: $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c)))
48+
49
50 include $(top_srcdir)/include/mk/generic_leaf_target.mk
51Index: git/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
52===================================================================
53--- git.orig/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
54+++ git/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
55@@ -24,7 +24,7 @@ generate_locate_test_makefile() {
56
57 echo "Generating $maketype Makefiles"
58
59- locate-test --$maketype | sed -e 's,^./,,g' | sort > make-gen.$maketype
60+ locate-test --$maketype | sed -e 's,^./,,g' | LC_ALL=C sort > make-gen.$maketype
61
62 generate_makefiles make-gen.$maketype $*
63
64Index: git/testcases/kernel/syscalls/lchown/Makefile
65===================================================================
66--- git.orig/testcases/kernel/syscalls/lchown/Makefile
67+++ git/testcases/kernel/syscalls/lchown/Makefile
68@@ -5,7 +5,7 @@ top_srcdir ?= ../../../..
69
70 include $(top_srcdir)/include/mk/testcases.mk
71
72-SRCS := $(wildcard $(abs_srcdir)/lchown*.c)
73+SRCS := $(sort $(wildcard $(abs_srcdir)/lchown*.c))
74
75 include $(abs_srcdir)/../utils/compat_16.mk
76
77Index: git/testcases/kernel/syscalls/migrate_pages/Makefile
78===================================================================
79--- git.orig/testcases/kernel/syscalls/migrate_pages/Makefile
80+++ git/testcases/kernel/syscalls/migrate_pages/Makefile
81@@ -5,7 +5,7 @@ top_srcdir ?= ../../../..
82
83 include $(top_srcdir)/include/mk/testcases.mk
84
85-MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[0-9].c))
86+MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*[0-9].c)))
87 $(MAKE_TARGETS): %: migrate_pages_common.o
88
89 CPPFLAGS += -I$(abs_srcdir)/../utils/
90Index: git/testcases/kernel/syscalls/utils/compat_16.mk
91===================================================================
92--- git.orig/testcases/kernel/syscalls/utils/compat_16.mk
93+++ git/testcases/kernel/syscalls/utils/compat_16.mk
94@@ -50,7 +50,7 @@
95
96 CPPFLAGS += -I$(abs_srcdir) -I$(abs_srcdir)/../utils
97
98-SRCS ?= $(wildcard $(abs_srcdir)/*.c)
99+SRCS ?= $(sort $(wildcard $(abs_srcdir)/*.c))
100
101 MAKE_TARGETS := $(notdir $(patsubst %.c,%,$(SRCS)))
102 MAKE_TARGETS_OBJS_WO_COMPAT_16 := $(addsuffix .o,$(MAKE_TARGETS))
103Index: git/testcases/kernel/syscalls/utils/newer_64.mk
104===================================================================
105--- git.orig/testcases/kernel/syscalls/utils/newer_64.mk
106+++ git/testcases/kernel/syscalls/utils/newer_64.mk
107@@ -25,7 +25,7 @@
108
109 CPPFLAGS += -I$(abs_srcdir) -I$(abs_srcdir)/../utils
110
111-SRCS ?= $(wildcard $(abs_srcdir)/*.c)
112+SRCS ?= $(sort $(wildcard $(abs_srcdir)/*.c))
113
114 MAKE_TARGETS := $(notdir $(patsubst %.c,%,$(SRCS)))
115
116Index: git/include/mk/env_post.mk
117===================================================================
118--- git.orig/include/mk/env_post.mk
119+++ git/include/mk/env_post.mk
120@@ -47,7 +47,7 @@ LDFLAGS += -L$(top_builddir)/lib/andr
121 LDFLAGS += -L$(top_builddir)/lib/android_librt
122 endif
123
124-MAKE_TARGETS ?= $(notdir $(patsubst %.c,%,$(wildcard $(abs_srcdir)/*.c)))
125+MAKE_TARGETS ?= $(notdir $(patsubst %.c,%,$(sort $(wildcard $(abs_srcdir)/*.c))))
126 MAKE_TARGETS := $(filter-out $(FILTER_OUT_MAKE_TARGETS),$(MAKE_TARGETS))
127
128 # with only *.dwo, .[0-9]+.dwo can not be cleaned
129Index: git/include/mk/module.mk
130===================================================================
131--- git.orig/include/mk/module.mk
132+++ git/include/mk/module.mk
133@@ -42,7 +42,7 @@ endif
134
135 ifneq ($(filter install clean,$(MAKECMDGOALS)),)
136 MAKE_TARGETS := $(filter-out %.ko, $(MAKE_TARGETS))
137-MAKE_TARGETS += $(wildcard *.ko)
138+MAKE_TARGETS += $(sort $(wildcard *.ko))
139 endif
140
141 CLEAN_TARGETS += .dep_modules *.mod built-in.a
142Index: git/runtest/Makefile
143===================================================================
144--- git.orig/runtest/Makefile
145+++ git/runtest/Makefile
146@@ -36,7 +36,7 @@ ifneq ($(WITH_POWER_MANAGEMENT_TESTSUITE
147 UNWANTED_FILES += power_management_tests
148 endif
149
150-INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(wildcard $(abs_srcdir)/*))))
151+INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(sort $(wildcard $(abs_srcdir)/*)))))
152
153 MAKE_TARGETS :=
154
155Index: git/scenario_groups/Makefile
156===================================================================
157--- git.orig/scenario_groups/Makefile
158+++ git/scenario_groups/Makefile
159@@ -31,7 +31,7 @@ UNWANTED_FILES := Makefile
160
161 INSTALL_MODE := 00644
162
163-INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(wildcard $(abs_srcdir)/*))))
164+INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(sort $(wildcard $(abs_srcdir)/*)))))
165
166 MAKE_TARGETS :=
167
168Index: git/testcases/kernel/io/disktest/Makefile.linux
169===================================================================
170--- git.orig/testcases/kernel/io/disktest/Makefile.linux
171+++ git/testcases/kernel/io/disktest/Makefile.linux
172@@ -167,8 +167,8 @@ mandir=/usr/share/man
173
174 VER=`grep VER_STR main.h | awk -F\" '{print $$2}'`
175 GBLHDRS=main.h globals.h defs.h
176-ALLHDRS=$(wildcard *.h)
177-SRCS=$(wildcard *.c)
178+ALLHDRS=$(sort $(wildcard *.h))
179+SRCS=$(sort $(wildcard *.c))
180 OBJS=$(SRCS:.c=.o)
181
182 CFLAGS += -g -Wall -O -D"LINUX" -D"_THREAD_SAFE" -D"_GNU_SOURCE" -D"_LARGE_FILES" -D"_LARGEFILE64_SOURCE" -D"_FILE_OFFSET_BITS=64" $(RPM_OPT_FLAGS)
183Index: git/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
184===================================================================
185--- git.orig/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
186+++ git/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
187@@ -28,6 +28,6 @@ INSTALL_TARGETS := smt_smp_affinity.sh
188
189 MAKE_TARGETS := ht_affinity
190
191-$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c))
192+$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c)))
193
194 include $(top_srcdir)/include/mk/generic_leaf_target.mk
195Index: git/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
196===================================================================
197--- git.orig/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
198+++ git/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
199@@ -28,6 +28,6 @@ INSTALL_TARGETS := smt_smp_enabled.sh
200
201 MAKE_TARGETS := ht_enabled
202
203-$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c))
204+$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c)))
205
206 include $(top_srcdir)/include/mk/generic_leaf_target.mk
207Index: git/testcases/kernel/sched/sched_stress/Makefile
208===================================================================
209--- git.orig/testcases/kernel/sched/sched_stress/Makefile
210+++ git/testcases/kernel/sched/sched_stress/Makefile
211@@ -10,7 +10,7 @@ INSTALL_TARGETS := sched_stress.sh
212
213 LDLIBS += -lpthread
214
215-MAKE_TARGETS := $(filter-out sched,$(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*.c)))
216+MAKE_TARGETS := $(filter-out sched,$(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*.c))))
217
218 RM += -r
219
220Index: git/testcases/kernel/syscalls/move_pages/Makefile
221===================================================================
222--- git.orig/testcases/kernel/syscalls/move_pages/Makefile
223+++ git/testcases/kernel/syscalls/move_pages/Makefile
224@@ -7,7 +7,7 @@ include $(top_srcdir)/include/mk/testcas
225
226 CPPFLAGS += -I$(abs_srcdir)/../utils
227
228-MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[0-9].c))
229+MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*[0-9].c)))
230
231 $(MAKE_TARGETS): %: move_pages_support.o
232
233Index: git/testcases/misc/math/float/Makefile
234===================================================================
235--- git.orig/testcases/misc/math/float/Makefile
236+++ git/testcases/misc/math/float/Makefile
237@@ -27,6 +27,6 @@ include $(top_srcdir)/include/mk/testcas
238 LDLIBS += -lpthread -lm
239
240 # main.c doesn't compile...
241-MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/float*.c))
242+MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/float*.c)))
243
244 include $(top_srcdir)/include/mk/generic_trunk_target.mk
245Index: git/testcases/network/nfs/nfs_stress/nfs05_make_tree.c
246===================================================================
247--- git.orig/testcases/network/nfs/nfs_stress/nfs05_make_tree.c
248+++ git/testcases/network/nfs/nfs_stress/nfs05_make_tree.c
249@@ -104,7 +104,7 @@ static void *thread_fn(LTP_ATTRIBUTE_UNU
250 "\treturn 0;\n}\n";
251
252 const char make_buf_n[] = "CFLAGS := -O -w -g\n"
253- "SRCS=$(wildcard *.c)\n"
254+ "SRCS=$(sort $(wildcard *.c))\n"
255 "TARGETS=$(SRCS:.c=)\n"
256 "all: $(TARGETS)\n"
257 "$(TARGETS): %: %.c\n"
258@@ -114,7 +114,7 @@ static void *thread_fn(LTP_ATTRIBUTE_UNU
259
260 const char make_buf[] = "CFLAGS := -O -w -g\n"
261 "SUBDIR = dir\n"
262- "SRCS=$(wildcard *.c)\n"
263+ "SRCS=$(sort $(wildcard *.c))\n"
264 "TARGETS=$(SRCS:.c=)\n"
265 "all: $(SUBDIR) $(TARGETS)\n"
266 "$(TARGETS): %: %.c\n"
267Index: git/testcases/network/nfsv4/locks/Makefile
268===================================================================
269--- git.orig/testcases/network/nfsv4/locks/Makefile
270+++ git/testcases/network/nfsv4/locks/Makefile
271@@ -28,6 +28,6 @@ MAKE_TARGETS := locktests
272
273 LDLIBS += -lpthread
274
275-$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c))
276+$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c)))
277
278 include $(top_srcdir)/include/mk/generic_leaf_target.mk
279Index: git/utils/sctp/func_tests/Makefile
280===================================================================
281--- git.orig/utils/sctp/func_tests/Makefile
282+++ git/utils/sctp/func_tests/Makefile
283@@ -30,7 +30,7 @@ LDFLAGS += $(addprefix -L$(abs_builddir
284
285 LDLIBS += -lsctputil -lsctp -lpthread
286
287-V4_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*.c))
288+V4_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*.c)))
289
290 V6_TARGETS := test_basic_v6 test_fragments_v6 test_getname_v6 \
291 test_inaddr_any_v6 test_peeloff_v6 \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-23 10:17:34 +0000