summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2014-10-03 10:17:47 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-06 15:15:51 +0100
commitfbcab6ee63afcd5cdaf75665ce91906243df74a2 (patch)
tree814ee828fb73ac7524b8fdaefbda3f464e118e67
parent94d2fea672140bcd561dc001da5759a927192b93 (diff)
downloadpoky-fbcab6ee63afcd5cdaf75665ce91906243df74a2.tar.gz
LTP - realtime tests - fix bad PI mutex conditionals
The priority inheritance tests for mutexes used conditional variables which were non-existent. Changed the conditional clauses to use the variables which were actually generated by LTP autoconf for that purpose. (From OE-Core rev: 812114ad23def92306fbf9f7afb03cee4cbd10d4) Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch48
-rw-r--r--meta/recipes-extended/ltp/ltp_20140422.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch
new file mode 100644
index 0000000000..fa20b085f7
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch
@@ -0,0 +1,48 @@
1From b601a8d1b39075a5339195fc0a4038f71ec3b49e Mon Sep 17 00:00:00 2001
2From: "Gary S. Robertson" <gary.robertson@linaro.org>
3Date: Wed, 27 Aug 2014 16:23:56 -0500
4Subject: [LTP][PATCH] Realtime tests: Fix bad priority inheritance conditionals
5
6testcases/realtime/lib/librttest.c and
7testcases/realtime/stress/pi-tests/testpi-3.c
8both referenced a non-existent autoconf configuration setting variable.
9Replaced the invalid variable name with the variable actually created
10by autoconf.
11
12Upstream-Status: Submitted
13
14Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
15---
16 testcases/realtime/lib/librttest.c | 2 +-
17 testcases/realtime/stress/pi-tests/testpi-3.c | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/testcases/realtime/lib/librttest.c b/testcases/realtime/lib/librttest.c
21index c175148..3679058 100644
22--- a/testcases/realtime/lib/librttest.c
23+++ b/testcases/realtime/lib/librttest.c
24@@ -586,7 +586,7 @@ void *busy_work_us(int us)
25
26 void init_pi_mutex(pthread_mutex_t * m)
27 {
28-#if HAVE_DECL_PTHREAD_PRIO_INHERIT
29+#if HAS_PRIORITY_INHERIT
30 pthread_mutexattr_t attr;
31 int ret;
32 int protocol;
33diff --git a/testcases/realtime/stress/pi-tests/testpi-3.c b/testcases/realtime/stress/pi-tests/testpi-3.c
34index 30f38f6..e483945 100644
35--- a/testcases/realtime/stress/pi-tests/testpi-3.c
36+++ b/testcases/realtime/stress/pi-tests/testpi-3.c
37@@ -365,7 +365,7 @@ int main(int argc, char *argv[])
38
39 printf("Start %s\n", argv[0]);
40
41-#if HAVE_DECL_PTHREAD_PRIO_INHERIT
42+#if HAS_PRIORITY_INHERIT
43 if (!nopi) {
44 pthread_mutexattr_t mutexattr;
45 int protocol;
46--
471.7.9.5
48
diff --git a/meta/recipes-extended/ltp/ltp_20140422.bb b/meta/recipes-extended/ltp/ltp_20140422.bb
index bb89d85616..499b26311c 100644
--- a/meta/recipes-extended/ltp/ltp_20140422.bb
+++ b/meta/recipes-extended/ltp/ltp_20140422.bb
@@ -28,6 +28,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
28 file://automake-foreign.patch \ 28 file://automake-foreign.patch \
29 file://make-setregid02-work.patch \ 29 file://make-setregid02-work.patch \
30 file://add-knob-for-numa.patch \ 30 file://add-knob-for-numa.patch \
31 file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \
31" 32"
32 33
33S = "${WORKDIR}/git" 34S = "${WORKDIR}/git"