summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch32
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch9
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch34
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch54
4 files changed, 35 insertions, 94 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch b/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch
new file mode 100644
index 0000000000..ade6a52b63
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch
@@ -0,0 +1,32 @@
1From 2d384f268791ecd5ff0f26c8137dd4de0a1c4566 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 10 Jun 2024 22:52:56 -0700
4Subject: [PATCH] Add __clear_cache declaration for clang
5
6__clear_cache was enabled on RISCV recently with 7352ba02390116f1cd6a9b583860ba28aa0a1b7a
7however it fails to compile with clang19 on RISCV
8With this error
9
10 hugemmap15.c:51:2: error: call to undeclared function '__clear_cache'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
11 51 | __clear_cache(p, p + COPY_SIZE);
12 | ^
13
14Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2024-June/038762.html]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Cc: Hui Min Mina Chou <minachou@andestech.com>
17---
18 testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c
22index a84ba6476..856e22ff3 100644
23--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c
24+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c
25@@ -21,6 +21,7 @@
26
27 #if defined(__clang__)
28 #pragma clang optimize off
29+ void __clear_cache(void *start, void *end);
30 #endif
31
32 #define _GNU_SOURCE
diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index cc98079651..5b6c780bec 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
1From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 1From 768159aa53257d247645a12518778f50b8fdf578 Mon Sep 17 00:00:00 2001
2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> 2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>
3Date: Wed, 29 Jul 2020 08:47:09 -0400 3Date: Wed, 29 Jul 2020 08:47:09 -0400
4Subject: [PATCH] Remove OOM tests from runtest/mm 4Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -14,10 +14,10 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
14 1 file changed, 6 deletions(-) 14 1 file changed, 6 deletions(-)
15 15
16diff --git a/runtest/mm b/runtest/mm 16diff --git a/runtest/mm b/runtest/mm
17index d859b331c..3c2962f44 100644 17index 6a8cd0b9d..8ce3f4416 100644
18--- a/runtest/mm 18--- a/runtest/mm
19+++ b/runtest/mm 19+++ b/runtest/mm
20@@ -74,12 +74,6 @@ ksm07 ksm07 20@@ -76,12 +76,6 @@ ksm07 ksm07
21 21
22 cpuset01 cpuset01 22 cpuset01 cpuset01
23 23
@@ -30,6 +30,3 @@ index d859b331c..3c2962f44 100644
30 swapping01 swapping01 -i 5 30 swapping01 swapping01 -i 5
31 31
32 thp01 thp01 -I 120 32 thp01 thp01 -I 120
33--
342.43.0
35
diff --git a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch b/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch
deleted file mode 100644
index 4a50d1ae38..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 14c710cae38aa96bd8d681e891b6a1d691f99988 Mon Sep 17 00:00:00 2001
2From: Xiangyu Chen <xiangyu.chen@windriver.com>
3Date: Thu, 14 Mar 2024 09:47:10 +0800
4Subject: [PATCH] scenario_groups/default: remove connectors
5
6runtest/connectors was removed in 9b642d89c, thus update scenario_groups/default.
7
8Fixes: 9b642d89c ("runtest: Merge runtest/connectors to kernel_misc")
9Closes: https://github.com/linux-test-project/ltp/pull/1144
10
11Upstream-Status: Backport from
12[https://github.com/linux-test-project/ltp/commit/14c710ca]
13
14Reviewed-by: Petr Vorel <pvorel@suse.cz>
15Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
16---
17 scenario_groups/default | 1 -
18 1 file changed, 1 deletion(-)
19
20diff --git a/scenario_groups/default b/scenario_groups/default
21index f17b2061a..ec77d8fb8 100644
22--- a/scenario_groups/default
23+++ b/scenario_groups/default
24@@ -16,7 +16,6 @@ controllers
25 filecaps
26 cap_bounds
27 fcntl-locktests
28-connectors
29 power_management_tests
30 hugetlb
31 commands
32--
332.34.1
34
diff --git a/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch b/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch
deleted file mode 100644
index ae8dc8706e..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-sched_stress-Use-time_t-instead-of-long-for-type.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 74074f9a71c876d6e95c2d72702888dd2fabc761 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 May 2024 11:43:20 -0700
4Subject: [PATCH] sched_stress: Use time_t instead of long for type
5
6This ensures it works across different architectures
7Fixes
8
9| sched_driver.c:744:43: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
10| 744 | printf("\nend time = %s\n", ctime(&end_time));
11| | ^~~~~~~~~
12
13With gcc-14
14
15Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/0a682f1af42d8d261202821be580fe26d17ee9b7]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 testcases/kernel/sched/sched_stress/sched_driver.c | 6 +++---
19 1 file changed, 3 insertions(+), 3 deletions(-)
20
21diff --git a/testcases/kernel/sched/sched_stress/sched_driver.c b/testcases/kernel/sched/sched_stress/sched_driver.c
22index 61573d788..5b8c187fe 100644
23--- a/testcases/kernel/sched/sched_stress/sched_driver.c
24+++ b/testcases/kernel/sched/sched_stress/sched_driver.c
25@@ -136,7 +136,7 @@ int debug = 0;
26 /*
27 * Function prototypes
28 */
29-void startup(long);
30+void startup(time_t);
31 int start_testcase(char *, char *, char *, char *, char *, char *);
32 int process_slots_in_use();
33 int available_user_process_slots();
34@@ -251,7 +251,7 @@ int main(int argc, char **argv)
35 * information to the screen and . It also initializes the *
36 * process id list and other global variables. *
37 *-----------------------------------------------------------------------*/
38-void startup(long start_time)
39+void startup(time_t start_time)
40 {
41 char tempbuffer[50]; /* temporary buffer to hold names */
42
43@@ -734,7 +734,7 @@ void kill_short_term_testcases()
44 void finishup(start_time)
45 long start_time; /* starting time to calculate elapsed time */
46 {
47- long end_time; /* time when program finished */
48+ time_t end_time; /* time when program finished */
49
50 /*
51 * Get the end time and calculate elapsed time; write all this out
52--
532.45.0
54
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-15 13:34:32 +0000