summaryrefslogtreecommitdiffstats
path: root/meta/recipes-rt/rt-tests
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-01-20 15:40:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-20 22:46:18 +0000
commitcc7fa85ad2faabbe6e9a1548b74e4247fd293352 (patch)
treebe020c46950cddd007c6d8ab9e53280fd143acb3 /meta/recipes-rt/rt-tests
parent2c1db1849edb0ca3e51079776a71e8d49d3184b3 (diff)
downloadpoky-cc7fa85ad2faabbe6e9a1548b74e4247fd293352.tar.gz
rt-tests/hwlatdetect: upgrade 1.9 -> 1.10
(From OE-Core rev: a831789158881bade4e431d88f54e4ec926d9fbe) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-rt/rt-tests')
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch10
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch52
-rw-r--r--meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb (renamed from meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb)0
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests.inc2
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests_1.10.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_1.9.bb)1
5 files changed, 7 insertions, 58 deletions
diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
index 8fd94b176c..b177ff7c5f 100644
--- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
+++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
@@ -1,4 +1,4 @@
1From f89d6d6d23e0dacfd0008f686a457d536edc406a Mon Sep 17 00:00:00 2001 1From b608a817df2b652cd5fa1b5a7cf14b7d2d8afd5f Mon Sep 17 00:00:00 2001
2From: Randy Witt <randy.e.witt@intel.com> 2From: Randy Witt <randy.e.witt@intel.com>
3Date: Fri, 16 Oct 2020 16:54:30 -0700 3Date: Fri, 16 Oct 2020 16:54:30 -0700
4Subject: [PATCH] Makefile: Allow for CC and AR to be overridden 4Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
@@ -9,17 +9,16 @@ commit 7763cf316d7896fa05b816a46998f0827ab6e6eb.
9Signed-off-by: Randy Witt <randy.e.witt@intel.com> 9Signed-off-by: Randy Witt <randy.e.witt@intel.com>
10 10
11Upstream-Status: Inappropriate [other] 11Upstream-Status: Inappropriate [other]
12
13--- 12---
14 Makefile | 4 ++-- 13 Makefile | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
16 15
17diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
18index c3ebbd7..2176835 100644 17index 636f191..9f57d2c 100644
19--- a/Makefile 18--- a/Makefile
20+++ b/Makefile 19+++ b/Makefile
21@@ -1,6 +1,6 @@ 20@@ -1,6 +1,6 @@
22 VERSION = 1.9 21 VERSION = 1.10
23-CC = $(CROSS_COMPILE)gcc 22-CC = $(CROSS_COMPILE)gcc
24-AR = $(CROSS_COMPILE)ar 23-AR = $(CROSS_COMPILE)ar
25+CC ?= $(CROSS_COMPILE)gcc 24+CC ?= $(CROSS_COMPILE)gcc
@@ -27,3 +26,6 @@ index c3ebbd7..2176835 100644
27 26
28 OBJDIR = bld 27 OBJDIR = bld
29 28
29--
302.29.2
31
diff --git a/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch b/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch
deleted file mode 100644
index 1ee7539f7d..0000000000
--- a/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 165b597e3003c6870f5980e8902014d9344e6cf3 Mon Sep 17 00:00:00 2001
2From: Peter Xu <peterx@redhat.com>
3Date: Thu, 1 Oct 2020 14:47:26 -0400
4Subject: [PATCH] rt-tests: oslat: Allow build for not supported archs
5
6Now rt-tests won't build for archs other than x86/i386/ppc64 after oslat is
7merged. Instead of failing the build, let's make it pass. However, whenever
8oslat is executed, instead of running the real program, dump an error message,
9so that people can try to implement the frc() function for it when there's a
10real need for the new arch.
11
12Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/?id=165b597e3003c6870f5980e8902014d9344e6cf3]
13
14Signed-off-by: Peter Xu <peterx@redhat.com>
15Signed-off-by: John Kacur <jkacur@redhat.com>
16Signed-off-by: Peter Bergin <peter@berginkonsult.se>
17
18---
19 src/oslat/oslat.c | 10 +++++++++-
20 1 file changed, 9 insertions(+), 1 deletion(-)
21
22diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c
23index f1a82f2..a8b6155 100644
24--- a/src/oslat/oslat.c
25+++ b/src/oslat/oslat.c
26@@ -69,7 +69,9 @@ static inline void frc(uint64_t *pval)
27 __asm__ __volatile__("mfspr %0, 268\n" : "=r" (*pval));
28 }
29 # else
30-# error Need frc() for this platform.
31+# define relax() do { } while (0)
32+# define frc(x)
33+# define FRC_MISSING
34 # endif
35 #else
36 # error Need to add support for this compiler.
37@@ -810,6 +812,12 @@ int main(int argc, char *argv[])
38 int i, n_cores;
39 cpu_set_t cpu_set;
40
41+#ifdef FRC_MISSING
42+ printf("This architecture is not yet supported. "
43+ "Please implement frc() function first for %s.\n", argv[0]);
44+ return 0;
45+#endif
46+
47 CPU_ZERO(&cpu_set);
48
49 g.app_name = argv[0];
50--
512.25.1
52
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb
index 5f61c4ecdd..5f61c4ecdd 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 2dd890cf95..9358f13d06 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,5 +1,5 @@
1# Version 1.8 1# Version 1.8
2SRCREV = "21c1df7d2ee199ac619cbb1806a38d15e7e95c09" 2SRCREV = "32819581cc0509c9d58c33c3061f57abe0c40c88"
3PE = "1" 3PE = "1"
4 4
5SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest" 5SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest"
diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.9.bb b/meta/recipes-rt/rt-tests/rt-tests_1.10.bb
index b916a7fe60..2834cabcd4 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_1.9.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_1.10.bb
@@ -12,7 +12,6 @@ SRC_URI += " \
12 file://run-ptest \ 12 file://run-ptest \
13 file://rt_bmark.py \ 13 file://rt_bmark.py \
14 file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ 14 file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \
15 file://0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch \
16 " 15 "
17 16
18# rt-tests needs PI mutex support in libc 17# rt-tests needs PI mutex support in libc