summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-05-28 18:59:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 17:53:40 +0100
commit269c8a56d0701525718efa9d938d90f96ac26d8e (patch)
tree644ad63f400e119e9ba0930a06e11fff71e8b46f
parent963c8ea99d71fef027a60c2142f4785c64bbfb66 (diff)
downloadpoky-269c8a56d0701525718efa9d938d90f96ac26d8e.tar.gz
ethtool: use serial-tests config needed by ptest.
buildtest-TESTS and runtest-TESTS targets are required by ptest. In order to have those targets in automake 1.13.4 serial-tests should be specified since parallel-tests is assumed by default and serial-tests is optional. ptest results: PASS: test-cmdline PASS: test-features ================== All 2 tests passed ================== (From OE-Core rev: 15bdef1f25ef567caf2f2e270de899e35da7cca9) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch19
-rw-r--r--meta/recipes-extended/ethtool/ethtool_3.14.bb6
2 files changed, 23 insertions, 2 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
new file mode 100644
index 0000000000..bf66267e81
--- /dev/null
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -0,0 +1,19 @@
1ptest needs buildtest-TESTS and runtest-TESTS targets.
2serial-tests is required to generate those targets.
3
4Signed-off-by: Tudor Florea <tudor.florea@enea.com>
5Upstream-Status: Inappropriate
6(default automake behavior incompatible with ptest)
7
8diff -ruN a/configure.ac b/configure.ac
9--- a/configure.ac 2014-05-28 18:19:13.513980977 +0200
10+++ b/configure.ac 2014-05-28 18:19:21.129660215 +0200
11@@ -2,7 +2,7 @@
12 AC_INIT(ethtool, 3.14, netdev@vger.kernel.org)
13 AC_PREREQ(2.52)
14 AC_CONFIG_SRCDIR([ethtool.c])
15-AM_INIT_AUTOMAKE([gnu])
16+AM_INIT_AUTOMAKE([gnu serial-tests])
17 AC_CONFIG_HEADERS([ethtool-config.h])
18
19 AM_MAINTAINER_MODE
diff --git a/meta/recipes-extended/ethtool/ethtool_3.14.bb b/meta/recipes-extended/ethtool/ethtool_3.14.bb
index 2a3ca7022f..49c79b68d7 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.14.bb
+++ b/meta/recipes-extended/ethtool/ethtool_3.14.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" 7 file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"
8 8
9SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ 9SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
10 file://run-ptest" 10 file://run-ptest \
11 file://avoid_parallel_tests.patch \
12 "
11 13
12SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a" 14SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a"
13SRC_URI[sha256sum] = "b1a988d6e397bd9d5d73cfd64329f85121936a050174bbfe90f8701fd893a1df" 15SRC_URI[sha256sum] = "b1a988d6e397bd9d5d73cfd64329f85121936a050174bbfe90f8701fd893a1df"
@@ -16,7 +18,7 @@ inherit autotools ptest
16RDEPENDS_${PN}-ptest += "make" 18RDEPENDS_${PN}-ptest += "make"
17 19
18do_compile_ptest() { 20do_compile_ptest() {
19 oe_runmake test-cmdline test-features 21 oe_runmake buildtest-TESTS
20} 22}
21 23
22do_install_ptest () { 24do_install_ptest () {