ethtool: fix ptest execution failure

PATCH Superseded Chong Lu 2 participants 4 messages May 26, 2014 – May 27, 2014

Share & tools

Chong Lu

author

2014-05-26 09:21 UTC #0 lore raw

cover ethtool: fix ptest execution failure

root@qemux86:/usr/lib/ethtool/ptest# ./run-ptest 
make[1]: Entering directory '/usr/lib/ethtool/ptest'
PASS: test-cmdline
PASS: test-features
============================================================================
Testsuite summary for ethtool 3.14
============================================================================
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[1]: Leaving directory '/usr/lib/ethtool/ptest'

The following changes since commit 894df445fa71a170397c6e0b4960a89ef20a4230:

guile: Update to 2.0.11 version (2014-05-21 19:50:21 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib chonglu/ethtool
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/ethtool

Chong Lu (1):
ethtool: fix ptest execution failure

 meta/recipes-extended/ethtool/ethtool/run-ptest |  2 +-
 meta/recipes-extended/ethtool/ethtool_3.14.bb   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

Signature · 1 line

1.8.1.2

Chong Lu

author

2014-05-26 09:21 UTC #1 lore raw

PATCH 1/1 ethtool: fix ptest execution failure

Modify ptest suite to make it enabled on new version.

Signed-off-by Chong Lu <[email protected]>

---
 meta/recipes-extended/ethtool/ethtool/run-ptest |  2 +-
 meta/recipes-extended/ethtool/ethtool_3.14.bb   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

meta/recipes-extended/ethtool/ethtool/run-ptest +1 -1

index 1e245da..a359387 100644
@@ -1,2 +1,2 @@
 #!/bin/sh
-make -k runtest-TESTS
+make -k check-TESTS

meta/recipes-extended/ethtool/ethtool_3.14.bb +10 -6

index 2a3ca70..9729f65 100644
@@ -13,16 +13,20 @@ SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a"
 SRC_URI[sha256sum] = "b1a988d6e397bd9d5d73cfd64329f85121936a050174bbfe90f8701fd893a1df"
 
 inherit autotools ptest
-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS_${PN}-ptest += "make bash gawk"
 
 do_compile_ptest() {
    oe_runmake test-cmdline test-features
 }
 
 do_install_ptest () {
-   cp ${B}/Makefile                 ${D}${PTEST_PATH}
-   install ${B}/test-cmdline        ${D}${PTEST_PATH}
-   install ${B}/test-features       ${D}${PTEST_PATH}
-   install ${B}/ethtool             ${D}${PTEST_PATH}/ethtool
-   sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/Makefile
+   for i in Makefile test-cmdline test-features; do \
+       install ${B}/$i ${D}${PTEST_PATH}; done
+   install ${S}/test-driver ${D}${PTEST_PATH}
+   sed -e 's/^Makefile/_Makefile/' \
+       -e 's/^test_cmdline_OBJECTS/#test_cmdline_OBJECTS/' \
+       -e 's/^test_features_OBJECTS/#test_features_OBJECTS/' \
+       -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \
+       -e '/^all:/,+1d' \
+       -i ${D}${PTEST_PATH}/Makefile
 }

Signature · 1 line

1.8.1.2

Tudor Florea

2014-05-26 16:02 UTC #2 lore raw

Quoted 38 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Chong Lu
Sent: Monday, May 26, 2014 12:22
To: [email protected]
Subject: [OE-core] [PATCH 1/1] ethtool: fix ptest execution failure
Modify ptest suite to make it enabled on new version.
Signed-off-by Chong Lu <[email protected]>
---
 meta/recipes-extended/ethtool/ethtool/run-ptest |  2 +-
 meta/recipes-extended/ethtool/ethtool_3.14.bb   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
meta/recipes-extended/ethtool/ethtool/run-ptest +1 -1
index 1e245da..a359387 100644
@@ -1,2 +1,2 @@
 #!/bin/sh
-make -k runtest-TESTS
+make -k check-TESTS
meta/recipes-extended/ethtool/ethtool_3.14.bb +0 -0
index 2a3ca70..9729f65 100644
@@ -13,16 +13,20 @@ SRC_URI[md5sum] =
"997e20c25c43ad5800f8ae3204455a8a"
SRC_URI[sha256sum] =
"b1a988d6e397bd9d5d73cfd64329f85121936a050174bbfe90f8701fd893a1df"
inherit autotools ptest

meta/recipes-extended/ethtool/ethtool_3.14.bb SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a" · line 16

Quoted 2 lines

meta/recipes-extended/ethtool/ethtool_3.14.bb +1 -1
-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS_${PN}-ptest += "make bash gawk"

Isn't possible to avoid bash and gawk dependency here? Regards,
Tudor

Quoted 29 lines

do_compile_ptest() {
oe_runmake test-cmdline test-features
}

do_install_ptest () {

meta/recipes-extended/ethtool/ethtool_3.14.bb +9 -6

-   cp ${B}/Makefile                 ${D}${PTEST_PATH}
-   install ${B}/test-cmdline        ${D}${PTEST_PATH}
-   install ${B}/test-features       ${D}${PTEST_PATH}
-   install ${B}/ethtool             ${D}${PTEST_PATH}/ethtool
-   sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/Makefile
+   for i in Makefile test-cmdline test-features; do \
+       install ${B}/$i ${D}${PTEST_PATH}; done
+   install ${S}/test-driver ${D}${PTEST_PATH}
+   sed -e 's/^Makefile/_Makefile/' \
+       -e 's/^test_cmdline_OBJECTS/#test_cmdline_OBJECTS/' \
+       -e 's/^test_features_OBJECTS/#test_features_OBJECTS/' \
+       -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \
+       -e '/^all:/,+1d' \
+       -i ${D}${PTEST_PATH}/Makefile
 }
--

1.8.1.2

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Chong Lu

author

2014-05-27 01:33 UTC #3 lore raw

Quoted 36 lines · Tudor Florea

Quoted 36 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Chong Lu
Sent: Monday, May 26, 2014 12:22
To: [email protected]
Subject: [OE-core] [PATCH 1/1] ethtool: fix ptest execution failure
Modify ptest suite to make it enabled on new version.
Signed-off-by Chong Lu <[email protected]>
---
  meta/recipes-extended/ethtool/ethtool/run-ptest |  2 +-
  meta/recipes-extended/ethtool/ethtool_3.14.bb   | 16 ++++++++++------
  2 files changed, 11 insertions(+), 7 deletions(-)
meta/recipes-extended/ethtool/ethtool/run-ptest +1 -1
index 1e245da..a359387 100644
@@ -1,2 +1,2 @@
  #!/bin/sh
-make -k runtest-TESTS
+make -k check-TESTS
meta/recipes-extended/ethtool/ethtool_3.14.bb +0 -0
index 2a3ca70..9729f65 100644
@@ -13,16 +13,20 @@ SRC_URI[md5sum] =
"997e20c25c43ad5800f8ae3204455a8a"
SRC_URI[sha256sum] =
"b1a988d6e397bd9d5d73cfd64329f85121936a050174bbfe90f8701fd893a1df"

Quoted 6 lines

meta/recipes-extended/ethtool/ethtool_3.14.bb SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a" · line 16
Quoted 3 lines
inherit autotools ptest
meta/recipes-extended/ethtool/ethtool_3.14.bb +1 -1
-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS_${PN}-ptest += "make bash gawk"
Isn't possible to avoid bash and gawk dependency here? Regards,
Tudor

Ok, it's possible. But it needs to change Makefile more. I will resend a V2.

Best Regards
Chong

Quoted 29 lines

Quoted 28 lines

  do_compile_ptest() {
     oe_runmake test-cmdline test-features
  }

  do_install_ptest () {

meta/recipes-extended/ethtool/ethtool_3.14.bb +9 -6

-   cp ${B}/Makefile                 ${D}${PTEST_PATH}
-   install ${B}/test-cmdline        ${D}${PTEST_PATH}
-   install ${B}/test-features       ${D}${PTEST_PATH}
-   install ${B}/ethtool             ${D}${PTEST_PATH}/ethtool
-   sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/Makefile
+   for i in Makefile test-cmdline test-features; do \
+       install ${B}/$i ${D}${PTEST_PATH}; done
+   install ${S}/test-driver ${D}${PTEST_PATH}
+   sed -e 's/^Makefile/_Makefile/' \
+       -e 's/^test_cmdline_OBJECTS/#test_cmdline_OBJECTS/' \
+       -e 's/^test_features_OBJECTS/#test_features_OBJECTS/' \
+       -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \
+       -e '/^all:/,+1d' \
+       -i ${D}${PTEST_PATH}/Makefile
  }
--

1.8.1.2

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core