[PATCH 1/2] 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

[Alexander Kanavin]

Upstream only enables the test if --with-patch-wrapper
was supplied to ./configure, and so should we.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/quilt/quilt.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index d6d06c049c..d2db079e0b 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -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"
-- 
2.25.1

[PATCH 2/2] ptest: further bump RAM in qemu

[Alexander Kanavin]

Particularly gdk-pixbuf tests were hitting the 2M limit with an image size
that is just under that.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 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(-)

diff --git a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb
index 3641217306..29afb91d77 100644
--- a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb
+++ b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb
@@ -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"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
index bf749acd79..220c427387 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
@@ -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"
-- 
2.25.1

Re: [OE-core] [PATCH 1/2] quilt: do not test patch-wrapper as it is not enabled

[Matthew]

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

Alexander Kanavin <alex.kanavin@gmail.com> writes:

> Upstream only enables the test if --with-patch-wrapper
> was supplied to ./configure, and so should we.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/recipes-devtools/quilt/quilt.inc | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
> index d6d06c049c..d2db079e0b 100644
> --- a/meta/recipes-devtools/quilt/quilt.inc
> +++ b/meta/recipes-devtools/quilt/quilt.inc
> @@ -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

Re: [OE-core] [PATCH 1/2] quilt: do not test patch-wrapper as it is not enabled

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 1762 bytes --]

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

On Wed, 15 Apr 2020 at 20:35, Mingde (Matthew) Zeng <
matthew.zeng@windriver.com> wrote:

>
> 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
>
> Alexander Kanavin <alex.kanavin@gmail.com> writes:
>
> > Upstream only enables the test if --with-patch-wrapper
> > was supplied to ./configure, and so should we.
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> >  meta/recipes-devtools/quilt/quilt.inc | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/recipes-devtools/quilt/quilt.inc
> b/meta/recipes-devtools/quilt/quilt.inc
> > index d6d06c049c..d2db079e0b 100644
> > --- a/meta/recipes-devtools/quilt/quilt.inc
> > +++ b/meta/recipes-devtools/quilt/quilt.inc
> > @@ -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
>

[-- Attachment #2: Type: text/html, Size: 2488 bytes --]