ifupdown: add ptest
PATCH 1/1 ifupdown: add ptest
From: Kai Kang <[email protected]>
Add ptest for ifupdown with its own test cases.
[Yocto #13736]
--- meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ifupdown/files/run-ptest create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
meta/recipes-core/ifupdown/files/run-ptest new file +4 -0
@@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linux
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +9 -1
@@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" S = "${WORKDIR}/git" -inherit update-alternatives +inherit ptest update-alternatives do_compile () { chmod a+rx *.pl *.sh
@@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} + ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "ifup ifdown"
Signature · 1 line
2.17.1
I think a build configuration for this also needs to be enabled and tested as explained in the email thread from the bug (in magefeatures.py from selftest I think). Otherwise this wouldn’t be built or checked anywhere.
Alex
Quoted 124 lines · On 3 Feb 2020, at 10.14, <[email protected]> <[email protected]>…
From: Kai Kang <[email protected]>
Add ptest for ifupdown with its own test cases.
[Yocto #13736]
Signed-off-by Kai Kang <[email protected]>---
meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- 3 files changed, 62 insertions(+), 1 deletion(-)create mode 100644 meta/recipes-core/ifupdown/files/run-ptest create mode 100644
meta/recipes-core/ifupdown/files/tweak-ptest-script.patchmeta/recipes-core/ifupdown/files/run-ptest new file +4
-0@@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linuxmeta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +49
-0@@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang <[email protected]> + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -e + +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test + + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test + + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then +- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "=========="meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +2
-0@@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ "SRCREV = "
4af76318cfc57f8e4a44d357104188666213bd4b"S = "${WORKDIR}/git"
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +1
-1-inherit update-alternatives +inherit ptest update-alternatives
do_compile() {
chmod a+rx *.pl *.shmeta/recipes-core/ifupdown/ifupdown_0.8.35.bb +6
-0@@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} +
ALTERNATIVE_PRIORITY= "100"
ALTERNATIVE_${PN} = "ifup ifdown"Signature · 7 lines
2.17.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 1 line · Alexander Kanavin
I think a build configuration for this also needs to be enabled and tested as explained in the email thread from the bug (in
magefeatures.pyfrom selftest I think). Otherwise this wouldn’t be built or checked anywhere.
Hi Alex,
In imagefeatures.py, it just run 'bitbake -g core-image-sato' and doesn't really build and test RDEPENDS packages of packagegroup-core-base-utils.
So for the packages in the RDEPENDS packages of packagegroup-core-base-utils but not in any image, they all are not be tested.
I didn't find a proper recipe to place these recipes. Maybe a new image recipe need to be created.
Regards,
Kai
Quoted 127 lines
Alex
Quoted 124 lines · On 3 Feb 2020, at 10.14, <[email protected]> <[email protected]>…
From: Kai Kang <[email protected]>
Add ptest for ifupdown with its own test cases.
[Yocto #13736]
Signed-off-by Kai Kang <[email protected]>---
meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- 3 files changed, 62 insertions(+), 1 deletion(-)create mode 100644 meta/recipes-core/ifupdown/files/run-ptest create mode 100644
meta/recipes-core/ifupdown/files/tweak-ptest-script.patchmeta/recipes-core/ifupdown/files/run-ptest new file +4
-0@@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linuxmeta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +49
-0@@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang <[email protected]> + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -e + +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test + + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test + + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then +- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "=========="meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +2
-0@@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ "SRCREV = "
4af76318cfc57f8e4a44d357104188666213bd4b"S = "${WORKDIR}/git"
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +1
-1-inherit update-alternatives +inherit ptest update-alternatives
do_compile() {
chmod a+rx *.pl *.shmeta/recipes-core/ifupdown/ifupdown_0.8.35.bb +6
-0@@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} +
ALTERNATIVE_PRIORITY= "100"
ALTERNATIVE_${PN} = "ifup ifdown"Signature · 7 lines
2.17.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Kai Kang
imagefeatures.py does set:
PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils" VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
which I believe does actually replace replace busybox with that packagegroup in any image, as packagegroup-core-boot RDEPENDS on VIRTUAL-RUNTIME_base-utils.
I'm not sure why imagefeatures.py only does 'bitbake("--graphviz core-image-sato")' instead of building and booting that image properly, but this is exactly the place where it should happen.
Alex
Quoted 169 lines · Kang Kai
In
imagefeatures.py, it just run 'bitbake -g core-image-sato' and doesn't really build and test RDEPENDS packages of packagegroup-core-base-utils.So for the packages in the RDEPENDS packages of packagegroup-core-base-utils but not in any image, they all are not be tested.
I didn't find a proper recipe to place these recipes. Maybe a new image recipe need to be created.
Regards,
KaiQuoted 4 lines
Alex
Quoted 1 line
On 3 Feb 2020, at 10.14, <[email protected]> <
Quoted 7 lines · [email protected]> wrote:
Quoted 7 lines
From: Kai Kang <[email protected]>
Add ptest for ifupdown with its own test cases.
[Yocto #13736]
Quoted 8 lines
Quoted 8 lines
Signed-off-by Kai Kang <[email protected]>---
meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- 3 files changed, 62 insertions(+), 1 deletion(-)create mode 100644 meta/recipes-core/ifupdown/files/run-ptest create mode 100644
meta/recipes-core/ifupdown/files/tweak-ptest-script.patchQuoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta/recipes-core/ifupdown/files/run-ptest
Quoted 10 lines
Review
Quoted 10 lines
new file mode 100644
index 0000000000..8694042392meta/recipes-core/ifupdown/files/run-ptest new file +4
-0@@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linux(quoted diff) +0
-0
b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patchQuoted 17 lines
Quoted 17 lines
new file mode 100644
index 0000000000..d7600cf243meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +12
-0@@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang <[email protected]> + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -eQuoted 8 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
Quoted 8 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +8
-0+ +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1617 18; do
Quoted 4 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
Quoted 4 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +4
-0+ echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test--state-dir=$dir/state.$test $args \
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 25
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +1
-0++ ifup -v --no-act-commands --force -i $dir/testcase.$test--state-dir=$dir/state.$test $args \
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 26
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +1
-0+ >$dir/up-res-out.$test 2>$dir/up-res-err.$test ||exitcode=$?
Quoted 3 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
Quoted 3 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +3
-0+ + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1617 18; do
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 30
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +1
-0+ echo "====stderr===="; cat $dir/up-res-err.$test) >$dir/up-res.$test
Quoted 3 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
Quoted 3 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +3
-0+ + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test--state-dir=$dir/state.$test $args \
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 34
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +1
-0++ ifdown -v --no-act-commands --force -i $dir/testcase.$test--state-dir=$dir/state.$test $args \
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 35
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +1
-0+ >$dir/down-res-out.$test 2>$dir/down-res-err.$test ||exitcode=$?
Quoted 3 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
Quoted 3 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +3
-0+ + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1617 18; do
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 39
Quoted 1 line
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +1
-0+ echo "====stderr===="; cat $dir/down-res-err.$test) >$dir/down-res.$test
Quoted 2 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch line 41
Quoted 2 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +2
-0+ + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub$dir/down.$test $dir/down-res.$test; then
Quoted 9 lines
Review
Quoted 9 lines
meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file +8
-0+- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "=========="(quoted diff) +0
-0b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb
Quoted 4 lines
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb SRC_URI = "git://
Quoted 4 lines
index
0de97fe372..53cb971d33100644meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +0
-0@@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \
Quoted 3 lines
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ · line 18
Quoted 3 lines
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +0
-0file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \
Quoted 2 lines
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb SRC_URI = "git:// · line 15
Quoted 2 lines
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +2
-0+ file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest','file://tweak-ptest-script.patch', '', d)} \
Quoted 24 lines
Quoted 24 lines
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +0
-0"SRCREV = "
4af76318cfc57f8e4a44d357104188666213bd4b"S = "${WORKDIR}/git"
meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +1
-1-inherit update-alternatives +inherit ptest update-alternatives
do_compile() {
chmod a+rx *.pl *.shmeta/recipes-core/ifupdown/ifupdown_0.8.35.bb +6
-0@@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} +
ALTERNATIVE_PRIORITY= "100"
ALTERNATIVE_${PN} = "ifup ifdown"Quoted 8 lines
Quoted 8 lines
--
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
Kai Kang
Quoted 6 lines · Alexander Kanavin
imagefeatures.pydoes set:PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base- utils"
VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
Quoted 7 lines
which I believe does actually replace replace busybox with that packagegroup in any image, as packagegroup-core-boot RDEPENDS on VIRTUAL-RUNTIME_base-utils.
I'm not sure why
imagefeatures.pyonly does 'bitbake("--graphviz core-image-sato")' instead of building and booting that image properly, but this is exactly the place where it should happen.
I suspect it dates from a time where booting and testing the image likely wouldn't have worked. It sounds like there would be a lot more value in that now.
I merged this patch on the basis it was a good step forwards on the issue in case that wasn't clear.
Cheers,
Richard