quilt: do not test patch-wrapper as it is not enabled
PATCH 1/2 quilt: do not test patch-wrapper as it is not enabled
Upstream only enables the test if --with-patch-wrapper was supplied to ./configure, and so should we.
--- meta/recipes-devtools/quilt/quilt.inc | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-devtools/quilt/quilt.inc +3 -0
@@ -71,6 +71,9 @@ do_install_ptest() { tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} + + # This is specifically excluded when --with-patch-wrapper is absent during ./configure + rm ${D}${PTEST_PATH}/test/patch-wrapper.test } PACKAGES += "guards guards-doc"
Signature · 1 line
2.25.1
PATCH 2/2 ptest: further bump RAM in qemu
Particularly gdk-pixbuf tests were hitting the 2M limit with an image size that is just under that.
--- meta/recipes-sato/images/core-image-sato-ptest-fast.bb | 2 +- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-sato/images/core-image-sato-ptest-fast.bb +1 -1
@@ -13,7 +13,7 @@ IMAGE_OVERHEAD_FACTOR = "1.0" IMAGE_ROOTFS_EXTRA_SPACE = "1524288" # ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" +QB_MEM = "-m 2560" # Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places PTEST_EXPECT_FAILURE = "1"
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +1 -1
@@ -17,7 +17,7 @@ IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer # also lttng-tools needs /tmp that has at least 1G -QB_MEM = "-m 2048" +QB_MEM = "-m 2560" # Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places PTEST_EXPECT_FAILURE = "1"
Signature · 1 line
2.25.1
Can we get an update regarding the status of this patch? It is to fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=13841 which the target milestone is set to 3.1 M4.
Thanks,
Matthew
Quoted 13 lines · Alexander Kanavin
Upstream only enables the test if --with-patch-wrapper was supplied to ./configure, and so should we.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/quilt/quilt.inc | 3 +++ 1 file changed, 3 insertions(+)meta/recipes-devtools/quilt/quilt.inc +0
-0
meta/recipes-devtools/quilt/quilt.inc do_install_ptest() { · line 79
Quoted 9 lines
meta/recipes-devtools/quilt/quilt.inc +3
-0@@ -71,6 +71,9 @@ do_install_ptest() { tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} + + # This is specifically excluded when --with-patch-wrapper is absent during ./configure + rm ${D}${PTEST_PATH}/test/patch-wrapper.test } PACKAGES += "guards guards-doc"
--
Mingde (Matthew) Zeng
Richard didn't want to merge the patch, as the intermittent nature of the failure means there may be a deeper issue that will not be solved by disabling the test that exposes it. Sadly I have not been able to reproduce this at all, so if you have better ideas or a good understanding of what the test is doing, you are welcome to help.
Alex
Quoted 40 lines · Mingde (Matthew) Zeng
Can we get an update regarding the status of this patch? It is to fix
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13841 which the target milestone is set to 3.1 M4.Thanks,
MatthewReview
Quoted 9 lines · Alexander Kanavin
Upstream only enables the test if --with-patch-wrapper was supplied to ./configure, and so should we.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/quilt/quilt.inc | 3 +++ 1 file changed, 3 insertions(+)(quoted diff) +0
-0b/meta/recipes-devtools/quilt/quilt.inc
meta/recipes-devtools/quilt/quilt.inc do_install_ptest() { · line 71
Quoted 5 lines
index
d6d06c049c..d2db079e0b100644meta/recipes-devtools/quilt/quilt.inc +0
-0@@ -71,6 +71,9 @@ do_install_ptest() { tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd${D}${PTEST_PATH} && tar -xf - && chmod 777 test)
meta/recipes-devtools/quilt/quilt.inc do_install_ptest() {
Quoted 4 lines
meta/recipes-devtools/quilt/quilt.inc +2
-0cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} + + # This is specifically excluded when --with-patch-wrapper isabsent during ./configure
meta/recipes-devtools/quilt/quilt.inc do_install_ptest() { · line 79
Quoted 4 lines
meta/recipes-devtools/quilt/quilt.inc +1
-0+ rm ${D}${PTEST_PATH}/test/patch-wrapper.test } PACKAGES += "guards guards-doc"--
Mingde (Matthew) Zeng