From 812114ad23def92306fbf9f7afb03cee4cbd10d4 Mon Sep 17 00:00:00 2001 From: "Gary S. Robertson" Date: Fri, 3 Oct 2014 10:17:47 -0500 Subject: 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. Signed-off-by: Gary S. Robertson Signed-off-by: Richard Purdie --- ...sts-Fix-bad-priority-inheritance-conditio.patch | 48 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20140422.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch 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 @@ +From b601a8d1b39075a5339195fc0a4038f71ec3b49e Mon Sep 17 00:00:00 2001 +From: "Gary S. Robertson" +Date: Wed, 27 Aug 2014 16:23:56 -0500 +Subject: [LTP][PATCH] Realtime tests: Fix bad priority inheritance conditionals + +testcases/realtime/lib/librttest.c and +testcases/realtime/stress/pi-tests/testpi-3.c +both referenced a non-existent autoconf configuration setting variable. +Replaced the invalid variable name with the variable actually created +by autoconf. + +Upstream-Status: Submitted + +Signed-off-by: Gary S. Robertson +--- + testcases/realtime/lib/librttest.c | 2 +- + testcases/realtime/stress/pi-tests/testpi-3.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testcases/realtime/lib/librttest.c b/testcases/realtime/lib/librttest.c +index c175148..3679058 100644 +--- a/testcases/realtime/lib/librttest.c ++++ b/testcases/realtime/lib/librttest.c +@@ -586,7 +586,7 @@ void *busy_work_us(int us) + + void init_pi_mutex(pthread_mutex_t * m) + { +-#if HAVE_DECL_PTHREAD_PRIO_INHERIT ++#if HAS_PRIORITY_INHERIT + pthread_mutexattr_t attr; + int ret; + int protocol; +diff --git a/testcases/realtime/stress/pi-tests/testpi-3.c b/testcases/realtime/stress/pi-tests/testpi-3.c +index 30f38f6..e483945 100644 +--- a/testcases/realtime/stress/pi-tests/testpi-3.c ++++ b/testcases/realtime/stress/pi-tests/testpi-3.c +@@ -365,7 +365,7 @@ int main(int argc, char *argv[]) + + printf("Start %s\n", argv[0]); + +-#if HAVE_DECL_PTHREAD_PRIO_INHERIT ++#if HAS_PRIORITY_INHERIT + if (!nopi) { + pthread_mutexattr_t mutexattr; + int protocol; +-- +1.7.9.5 + 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 \ file://automake-foreign.patch \ file://make-setregid02-work.patch \ file://add-knob-for-numa.patch \ + file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg