Patchwork ethtool: use serial-tests to generate targets used by ptest.

login
register
mail settings
Submitter Tudor Florea
Date Dec. 3, 2013, 10:49 p.m.
Message ID <1386110965-24404-1-git-send-email-tudor.florea@enea.com>
Download mbox | patch
Permalink /patch/62757/
State New
Headers show

Comments

Tudor Florea - Dec. 3, 2013, 10:49 p.m.
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.


Signed-off-by: Tudor Florea <tudor.florea@enea.com>
---
 .../ethtool/ethtool-3.12.1/use_serial_tests.patch  |   20 ++++++++++++++++++++
 meta/recipes-extended/ethtool/ethtool_3.12.1.bb    |    6 ++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
Richard Purdie - Dec. 4, 2013, 10:50 a.m.
On Tue, 2013-12-03 at 23:49 +0100, Tudor Florea wrote:
> 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.
> 
> 
> Signed-off-by: Tudor Florea <tudor.florea@enea.com>
> ---
>  .../ethtool/ethtool-3.12.1/use_serial_tests.patch  |   20 ++++++++++++++++++++
>  meta/recipes-extended/ethtool/ethtool_3.12.1.bb    |    6 ++++--
>  2 files changed, 24 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch

This patch and the others imply we're going to have to patch every
autoconf recipe to add serial-tests?

Could we change the default in automake instead?

Cheers,

Richard

> diff --git a/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch b/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
> new file mode 100644
> index 0000000..e036edc
> --- /dev/null
> +++ b/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
> @@ -0,0 +1,20 @@
> +ptest needs buildtest-TESTS and runtest-TESTS targets.
> +serial-tests is required to generate those targets.
> +
> +Signed-off-by: Tudor Florea <tudor.florea@enea.com>
> +Upstream-Status: Inappropriate 
> +(default automake behavior incompatible with ptest) 
> +
> +diff -ruN a/configure.ac b/configure.ac
> +--- a/configure.ac	2013-12-03 10:37:40.773157142 +0100
> ++++ b/configure.ac	2013-12-03 10:37:21.521992831 +0100
> +@@ -2,7 +2,7 @@
> + AC_INIT(ethtool, 3.12.1, netdev@vger.kernel.org)
> + AC_PREREQ(2.52)
> + AC_CONFIG_SRCDIR([ethtool.c])
> +-AM_INIT_AUTOMAKE([gnu])
> ++AM_INIT_AUTOMAKE([gnu serial-tests])
> + AC_CONFIG_HEADERS([ethtool-config.h])
> + 
> + AM_MAINTAINER_MODE
> diff --git a/meta/recipes-extended/ethtool/ethtool_3.12.1.bb b/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
> index 6615009..5e7559c 100644
> --- a/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
> +++ b/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
> @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>                      file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"
>  
>  SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
> -           file://run-ptest"
> +           file://run-ptest \
> +           file://use_serial_tests.patch \
> +          "
>  
>  SRC_URI[md5sum] = "5a1058efe8eb4f3473f5028967729078"
>  SRC_URI[sha256sum] = "45190d70e5ce1b4d87def4f71fb5bf04f8a4f4dc5f9e0f38c49c16c462fb59d9"
> @@ -16,7 +18,7 @@ inherit autotools ptest
>  RDEPENDS_${PN}-ptest += "make"
>  
>  do_compile_ptest() {
> -   oe_runmake test-cmdline test-features
> +   oe_runmake buildtest-TESTS
>  }
>  
>  do_install_ptest () {
Tudor Florea - Dec. 4, 2013, 2:19 p.m.
>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Richard Purdie
> Sent: Wednesday, December 04, 2013 12:51 PM
> To: Tudor Florea
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] ethtool: use serial-tests to generate targets used by ptest.
>
> On Tue, 2013-12-03 at 23:49 +0100, Tudor Florea wrote:
>> 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.
>>
>>
>> Signed-off-by: Tudor Florea <tudor.florea@enea.com>
>> ---
>>   .../ethtool/ethtool-3.12.1/use_serial_tests.patch  |   20 ++++++++++++++++++++
>>   meta/recipes-extended/ethtool/ethtool_3.12.1.bb    |    6 ++++--
>>   2 files changed, 24 insertions(+), 2 deletions(-)  create mode 100644
>> meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
> This patch and the others imply we're going to have to patch every autoconf recipe to add serial-tests?
>
> Could we change the default in automake instead?
Unfortunately, changing the default in automake is not straightforward 
though this was my first option to consider.
(This imply reverting this commit and all depending commits: 
http://repo.or.cz/w/automake.git/commit/5e771b27e52cda72b1bfde18ed7a4f118fad24e0)
If my investigation is correct there are no more packages affected (in 
the same way) by the upgrade of automake.
This should be seen as a temporary fix until a proper fix will be added 
in automake so that ptest will work with parallel test harness.

Regards,
   Tudor.

>
> Cheers,
>
> Richard
>
>> diff --git
>> a/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
>> b/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
>> new file mode 100644
>> index 0000000..e036edc
>> --- /dev/null
>> +++ b/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.pa
>> +++ tch
>> @@ -0,0 +1,20 @@
>> +ptest needs buildtest-TESTS and runtest-TESTS targets.
>> +serial-tests is required to generate those targets.
>> +
>> +Signed-off-by: Tudor Florea <tudor.florea@enea.com>
>> +Upstream-Status: Inappropriate
>> +(default automake behavior incompatible with ptest)
>> +
>> +diff -ruN a/configure.ac b/configure.ac
>> +--- a/configure.ac	2013-12-03 10:37:40.773157142 +0100
>> ++++ b/configure.ac	2013-12-03 10:37:21.521992831 +0100
>> +@@ -2,7 +2,7 @@
>> + AC_INIT(ethtool, 3.12.1, netdev@vger.kernel.org)
>> + AC_PREREQ(2.52)
>> + AC_CONFIG_SRCDIR([ethtool.c])
>> +-AM_INIT_AUTOMAKE([gnu])
>> ++AM_INIT_AUTOMAKE([gnu serial-tests])
>> + AC_CONFIG_HEADERS([ethtool-config.h])
>> +
>> + AM_MAINTAINER_MODE
>> diff --git a/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
>> b/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
>> index 6615009..5e7559c 100644
>> --- a/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
>> +++ b/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
>> @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>>                       file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"
>>   
>>   SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
>> -           file://run-ptest"
>> +           file://run-ptest \
>> +           file://use_serial_tests.patch \
>> +          "
>>   
>>   SRC_URI[md5sum] = "5a1058efe8eb4f3473f5028967729078"
>>   SRC_URI[sha256sum] = "45190d70e5ce1b4d87def4f71fb5bf04f8a4f4dc5f9e0f38c49c16c462fb59d9"
>> @@ -16,7 +18,7 @@ inherit autotools ptest  RDEPENDS_${PN}-ptest +=
>> "make"
>>   
>>   do_compile_ptest() {
>> -   oe_runmake test-cmdline test-features
>> +   oe_runmake buildtest-TESTS
>>   }
>>   
>>   do_install_ptest () {
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch b/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
new file mode 100644
index 0000000..e036edc
--- /dev/null
+++ b/meta/recipes-extended/ethtool/ethtool-3.12.1/use_serial_tests.patch
@@ -0,0 +1,20 @@ 
+ptest needs buildtest-TESTS and runtest-TESTS targets.
+serial-tests is required to generate those targets.
+
+Signed-off-by: Tudor Florea <tudor.florea@enea.com>
+Upstream-Status: Inappropriate 
+(default automake behavior incompatible with ptest) 
+
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-12-03 10:37:40.773157142 +0100
++++ b/configure.ac	2013-12-03 10:37:21.521992831 +0100
+@@ -2,7 +2,7 @@
+ AC_INIT(ethtool, 3.12.1, netdev@vger.kernel.org)
+ AC_PREREQ(2.52)
+ AC_CONFIG_SRCDIR([ethtool.c])
+-AM_INIT_AUTOMAKE([gnu])
++AM_INIT_AUTOMAKE([gnu serial-tests])
+ AC_CONFIG_HEADERS([ethtool-config.h])
+ 
+ AM_MAINTAINER_MODE
diff --git a/meta/recipes-extended/ethtool/ethtool_3.12.1.bb b/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
index 6615009..5e7559c 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
+++ b/meta/recipes-extended/ethtool/ethtool_3.12.1.bb
@@ -7,7 +7,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
-           file://run-ptest"
+           file://run-ptest \
+           file://use_serial_tests.patch \
+          "
 
 SRC_URI[md5sum] = "5a1058efe8eb4f3473f5028967729078"
 SRC_URI[sha256sum] = "45190d70e5ce1b4d87def4f71fb5bf04f8a4f4dc5f9e0f38c49c16c462fb59d9"
@@ -16,7 +18,7 @@  inherit autotools ptest
 RDEPENDS_${PN}-ptest += "make"
 
 do_compile_ptest() {
-   oe_runmake test-cmdline test-features
+   oe_runmake buildtest-TESTS
 }
 
 do_install_ptest () {