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 --------------- meta/recipes-extended/ltp/ltp_20140828.bb | 93 ---------------------- meta/recipes-extended/ltp/ltp_20150119.bb | 81 +++++++++++++++++++ 4 files changed, 81 insertions(+), 203 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 delete mode 100644 meta/recipes-extended/ltp/ltp_20140828.bb create mode 100644 meta/recipes-extended/ltp/ltp_20150119.bb 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 - diff --git a/meta/recipes-extended/ltp/ltp_20140828.bb b/meta/recipes-extended/ltp/ltp_20140828.bb deleted file mode 100644 index 0be18a71c3..0000000000 --- a/meta/recipes-extended/ltp/ltp_20140828.bb +++ /dev/null @@ -1,93 +0,0 @@ -SUMMARY = "Linux Test Project" -DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features." -HOMEPAGE = "http://ltp.sourceforge.net" -SECTION = "console/utils" -LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ - file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \ - file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://tools/netpipe-2.4/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ - file://tools/netpipe-2.4-ipv6/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ - file://tools/top-LTP/proc/COPYING;md5=aefc88eb8a41672fbfcfe6b69ab8c49c \ - file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ -" - -DEPENDS = "attr libaio libcap acl openssl zip-native" -SRCREV = "2c341ad9177f36d9b953e84dee8cf88498286fe5" - -SRC_URI = "git://github.com/linux-test-project/ltp.git \ - file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ - file://ltp-Do-not-link-against-libfl.patch \ - file://make-setregid02-work.patch \ - file://add-knob-for-numa.patch \ - file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ - file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \ - file://add-knob-for-tirpc.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep - -TARGET_CC_ARCH += "${LDFLAGS}" - -export prefix = "/opt/ltp" -export exec_prefix = "/opt/ltp" - -PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," -EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" -EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " -# ltp network/rpc test cases ftbfs when libtirpc is found -EXTRA_OECONF += " --without-tirpc " - -# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. -# we explicitly force regeneration of that directory and pass configure options. -do_configure_append() { - (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS}) -} - -# The makefiles make excessive use of make -C and several include testcases.mk -# which triggers a build of the syscall header. To reproduce, build ltp, -# then delete the header, then "make -j XX" and watch regen.sh run multiple -# times. Its easier to generate this once here instead. -do_compile_prepend () { - ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) -} - -do_install(){ - install -d ${D}/opt/ltp/ - oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install - - # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual - cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases - - # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in oe-core - # We will add expect for enhancement in future - find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f -} - -RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk" - -FILES_${PN}-dbg += "\ - /opt/ltp/runtest/.debug \ - /opt/ltp/testcases/bin/.debug \ - /opt/ltp/testcases/bin/*/bin/.debug \ - /opt/ltp/testcases/bin/*/test/.debug \ - /opt/ltp/scenario_groups/.debug \ - /opt/ltp/testscripts/.debug \ - /opt/ltp/testscripts/open_posix_testsuite/.debug \ -" - -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a" - -FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" - -# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails -INHIBIT_PACKAGE_STRIP = "1" diff --git a/meta/recipes-extended/ltp/ltp_20150119.bb b/meta/recipes-extended/ltp/ltp_20150119.bb new file mode 100644 index 0000000000..b422646903 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp_20150119.bb @@ -0,0 +1,81 @@ +SUMMARY = "Linux Test Project" +DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features." +HOMEPAGE = "http://ltp.sourceforge.net" +SECTION = "console/utils" +LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ + file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ + file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ + file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \ + file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://tools/netpipe-2.4/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ + file://tools/netpipe-2.4-ipv6/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ + file://tools/top-LTP/proc/COPYING;md5=aefc88eb8a41672fbfcfe6b69ab8c49c \ + file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ +" + +DEPENDS = "attr libaio libcap acl openssl zip-native" +SRCREV = "b6ab85d764339b025526bdaf0b5026a67b3a677a" + +SRC_URI = "git://github.com/linux-test-project/ltp.git \ + file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ + file://ltp-Do-not-link-against-libfl.patch \ + file://make-setregid02-work.patch \ + file://add-knob-for-numa.patch \ + file://add-knob-for-tirpc.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +TARGET_CC_ARCH += "${LDFLAGS}" + +export prefix = "/opt/ltp" +export exec_prefix = "/opt/ltp" + +PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," +EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" +EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " +# ltp network/rpc test cases ftbfs when libtirpc is found +EXTRA_OECONF += " --without-tirpc " + +# The makefiles make excessive use of make -C and several include testcases.mk +# which triggers a build of the syscall header. To reproduce, build ltp, +# then delete the header, then "make -j XX" and watch regen.sh run multiple +# times. Its easier to generate this once here instead. +do_compile_prepend () { + ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) +} + +do_install(){ + install -d ${D}/opt/ltp/ + oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install + + # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual + cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases +} + +RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect" + +FILES_${PN}-dbg += "\ + /opt/ltp/runtest/.debug \ + /opt/ltp/testcases/bin/.debug \ + /opt/ltp/testcases/bin/*/bin/.debug \ + /opt/ltp/testcases/bin/*/test/.debug \ + /opt/ltp/scenario_groups/.debug \ + /opt/ltp/testscripts/.debug \ + /opt/ltp/testscripts/open_posix_testsuite/.debug \ +" + +FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a" + +FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" + +# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails +INHIBIT_PACKAGE_STRIP = "1" -- cgit 1.2.3-korg