From 01f91eaa81a986424bf7e9a6b65a73f6395e54cf Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Mon, 26 Jan 2015 16:01:00 +0100 Subject: ltp: update to 20150119 release Update LTP to 20150119 release 1. Remove 2 upstreamed patches 2. Add 'expect' to run time dependency and install the tests which depend on it. 3. ffsb related configuration problem was fixed in this release. Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- ...sts-Fix-bad-priority-inheritance-conditio.patch | 48 ----------------- ...ltime-tests-Fix-robust-mutex-conditionals.patch | 62 ---------------------- 2 files changed, 110 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch (limited to 'meta/recipes-extended/ltp/ltp') 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 deleted file mode 100644 index 631f9265ec..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch +++ /dev/null @@ -1,48 +0,0 @@ -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: Backported - -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/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch deleted file mode 100644 index 1fdd281013..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 663a14423baea0e05ba79d90d2497dde5e4594bd Mon Sep 17 00:00:00 2001 -From: "Gary S. Robertson" -Date: Thu, 11 Sep 2014 13:02:47 -0500 -Subject: [LTP][PATCH] Realtime tests: Fix robust mutex conditionals - -sbrk_mutex, testpi-5, and testpi-6 realtime tests in subdir -testcases/realtime/func/pi-tests used compile time config variables -which were not generated by autoconf in order to configure tests -for robust mutexes. Changed these conditionals to use the config -variables actually generated in the autoconf process. - -Upstream-Status: Backported - -Signed-off-by: Gary S. Robertson ---- - testcases/realtime/func/pi-tests/sbrk_mutex.c | 2 +- - testcases/realtime/func/pi-tests/testpi-5.c | 2 +- - testcases/realtime/func/pi-tests/testpi-6.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/testcases/realtime/func/pi-tests/sbrk_mutex.c b/testcases/realtime/func/pi-tests/sbrk_mutex.c -index 684021f..5c325b4 100644 ---- a/testcases/realtime/func/pi-tests/sbrk_mutex.c -+++ b/testcases/realtime/func/pi-tests/sbrk_mutex.c -@@ -45,7 +45,7 @@ - #include - #include "librttest.h" - --#if defined(HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS) && defined(PTHREAD_MUTEX_ROBUST_NP) -+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS - - #define NUM_MUTEXES 5000 - #define NUM_THREADS 50 -diff --git a/testcases/realtime/func/pi-tests/testpi-5.c b/testcases/realtime/func/pi-tests/testpi-5.c -index a1d93cc..70f02fd 100644 ---- a/testcases/realtime/func/pi-tests/testpi-5.c -+++ b/testcases/realtime/func/pi-tests/testpi-5.c -@@ -69,7 +69,7 @@ int do_test(int argc, char **argv) - pthread_mutexattr_t mutexattr; - int retc, protocol; - --#if HAS_PTHREAD_MUTEXATTR_PROTOCOL_FUNCTIONS -+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS - - if (pthread_mutexattr_init(&mutexattr) != 0) - printf("Failed to init mutexattr\n"); -diff --git a/testcases/realtime/func/pi-tests/testpi-6.c b/testcases/realtime/func/pi-tests/testpi-6.c -index b3c3e4a..f715eee 100644 ---- a/testcases/realtime/func/pi-tests/testpi-6.c -+++ b/testcases/realtime/func/pi-tests/testpi-6.c -@@ -41,7 +41,7 @@ - #include - #include - --#if defined(PTHREAD_MUTEX_ROBUST_NP) -+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS - pthread_mutex_t child_mutex; - - void *child_thread(void *arg) --- -1.7.9.5 - -- cgit 1.2.3-korg