summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@enea.com>2015-01-26 16:01:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:49 +0000
commit29de3d27c245cec2f37468d38046396290da04c9 (patch)
tree6f0c376b85565a20404888d8f27c28fac70c5870 /meta/recipes-extended/ltp
parentb688d55d10e915e4b6524421efa9da50c4848b17 (diff)
downloadpoky-29de3d27c245cec2f37468d38046396290da04c9.tar.gz
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. (From OE-Core rev: 01f91eaa81a986424bf7e9a6b65a73f6395e54cf) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp')
-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/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch62
-rw-r--r--meta/recipes-extended/ltp/ltp_20150119.bb (renamed from meta/recipes-extended/ltp/ltp_20140828.bb)16
3 files changed, 2 insertions, 124 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
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 @@
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: Backported
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/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 @@
1From 663a14423baea0e05ba79d90d2497dde5e4594bd Mon Sep 17 00:00:00 2001
2From: "Gary S. Robertson" <gary.robertson@linaro.org>
3Date: Thu, 11 Sep 2014 13:02:47 -0500
4Subject: [LTP][PATCH] Realtime tests: Fix robust mutex conditionals
5
6sbrk_mutex, testpi-5, and testpi-6 realtime tests in subdir
7testcases/realtime/func/pi-tests used compile time config variables
8which were not generated by autoconf in order to configure tests
9for robust mutexes. Changed these conditionals to use the config
10variables actually generated in the autoconf process.
11
12Upstream-Status: Backported
13
14Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
15---
16 testcases/realtime/func/pi-tests/sbrk_mutex.c | 2 +-
17 testcases/realtime/func/pi-tests/testpi-5.c | 2 +-
18 testcases/realtime/func/pi-tests/testpi-6.c | 2 +-
19 3 files changed, 3 insertions(+), 3 deletions(-)
20
21diff --git a/testcases/realtime/func/pi-tests/sbrk_mutex.c b/testcases/realtime/func/pi-tests/sbrk_mutex.c
22index 684021f..5c325b4 100644
23--- a/testcases/realtime/func/pi-tests/sbrk_mutex.c
24+++ b/testcases/realtime/func/pi-tests/sbrk_mutex.c
25@@ -45,7 +45,7 @@
26 #include <unistd.h>
27 #include "librttest.h"
28
29-#if defined(HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS) && defined(PTHREAD_MUTEX_ROBUST_NP)
30+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS
31
32 #define NUM_MUTEXES 5000
33 #define NUM_THREADS 50
34diff --git a/testcases/realtime/func/pi-tests/testpi-5.c b/testcases/realtime/func/pi-tests/testpi-5.c
35index a1d93cc..70f02fd 100644
36--- a/testcases/realtime/func/pi-tests/testpi-5.c
37+++ b/testcases/realtime/func/pi-tests/testpi-5.c
38@@ -69,7 +69,7 @@ int do_test(int argc, char **argv)
39 pthread_mutexattr_t mutexattr;
40 int retc, protocol;
41
42-#if HAS_PTHREAD_MUTEXATTR_PROTOCOL_FUNCTIONS
43+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS
44
45 if (pthread_mutexattr_init(&mutexattr) != 0)
46 printf("Failed to init mutexattr\n");
47diff --git a/testcases/realtime/func/pi-tests/testpi-6.c b/testcases/realtime/func/pi-tests/testpi-6.c
48index b3c3e4a..f715eee 100644
49--- a/testcases/realtime/func/pi-tests/testpi-6.c
50+++ b/testcases/realtime/func/pi-tests/testpi-6.c
51@@ -41,7 +41,7 @@
52 #include <unistd.h>
53 #include <librttest.h>
54
55-#if defined(PTHREAD_MUTEX_ROBUST_NP)
56+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS
57 pthread_mutex_t child_mutex;
58
59 void *child_thread(void *arg)
60--
611.7.9.5
62
diff --git a/meta/recipes-extended/ltp/ltp_20140828.bb b/meta/recipes-extended/ltp/ltp_20150119.bb
index 0be18a71c3..b422646903 100644
--- a/meta/recipes-extended/ltp/ltp_20140828.bb
+++ b/meta/recipes-extended/ltp/ltp_20150119.bb
@@ -20,15 +20,13 @@ LIC_FILES_CHKSUM = "\
20" 20"
21 21
22DEPENDS = "attr libaio libcap acl openssl zip-native" 22DEPENDS = "attr libaio libcap acl openssl zip-native"
23SRCREV = "2c341ad9177f36d9b953e84dee8cf88498286fe5" 23SRCREV = "b6ab85d764339b025526bdaf0b5026a67b3a677a"
24 24
25SRC_URI = "git://github.com/linux-test-project/ltp.git \ 25SRC_URI = "git://github.com/linux-test-project/ltp.git \
26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ 26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
27 file://ltp-Do-not-link-against-libfl.patch \ 27 file://ltp-Do-not-link-against-libfl.patch \
28 file://make-setregid02-work.patch \ 28 file://make-setregid02-work.patch \
29 file://add-knob-for-numa.patch \ 29 file://add-knob-for-numa.patch \
30 file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \
31 file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \
32 file://add-knob-for-tirpc.patch \ 30 file://add-knob-for-tirpc.patch \
33" 31"
34 32
@@ -47,12 +45,6 @@ EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite "
47# ltp network/rpc test cases ftbfs when libtirpc is found 45# ltp network/rpc test cases ftbfs when libtirpc is found
48EXTRA_OECONF += " --without-tirpc " 46EXTRA_OECONF += " --without-tirpc "
49 47
50# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call.
51# we explicitly force regeneration of that directory and pass configure options.
52do_configure_append() {
53 (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS})
54}
55
56# The makefiles make excessive use of make -C and several include testcases.mk 48# The makefiles make excessive use of make -C and several include testcases.mk
57# which triggers a build of the syscall header. To reproduce, build ltp, 49# which triggers a build of the syscall header. To reproduce, build ltp,
58# then delete the header, then "make -j XX" and watch regen.sh run multiple 50# then delete the header, then "make -j XX" and watch regen.sh run multiple
@@ -67,13 +59,9 @@ do_install(){
67 59
68 # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual 60 # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
69 cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases 61 cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
70
71 # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in oe-core
72 # We will add expect for enhancement in future
73 find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f
74} 62}
75 63
76RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk" 64RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect"
77 65
78FILES_${PN}-dbg += "\ 66FILES_${PN}-dbg += "\
79 /opt/ltp/runtest/.debug \ 67 /opt/ltp/runtest/.debug \