| Message ID | 20241111083541.291594-2-olani@axis.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove automake patch that changes path to test-driver | expand |
On Mon, 2024-11-11 at 09:35 +0100, Ola x Nilsson via lists.openembedded.org wrote: > From: Ola x Nilsson <olani@axis.com> > > Add a sed substitution for ${PTEST_PATH}/Makefile that transforms > TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver > to > TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver > which is where the test-driver script can be found when installed. > > There used to be an oe-core automake patch to do this, but it > broke non-ptest use of automake. > > Relates to [YOCTO #15635] > --- > meta/recipes-support/attr/attr.inc | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) Your patches are missing Signed-off-by lines. There is also a consistent ptest failure in acl: https://valkyrie.yoctoproject.org/#/builders/61/builds/366 https://valkyrie.yoctoproject.org/#/builders/73/builds/366 https://valkyrie.yoctoproject.org/#/builders/73/builds/367 Cheers, Richard
On Tue, Nov 12 2024, Richard Purdie wrote: > On Mon, 2024-11-11 at 09:35 +0100, Ola x Nilsson via lists.openembedded.org wrote: >> From: Ola x Nilsson <olani@axis.com> >> >> Add a sed substitution for ${PTEST_PATH}/Makefile that transforms >> TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver >> to >> TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver >> which is where the test-driver script can be found when installed. >> >> There used to be an oe-core automake patch to do this, but it >> broke non-ptest use of automake. >> >> Relates to [YOCTO #15635] >> --- >> meta/recipes-support/attr/attr.inc | 11 +++++++---- >> 1 file changed, 7 insertions(+), 4 deletions(-) > > Your patches are missing Signed-off-by lines. There is also a > consistent ptest failure in acl: > > https://valkyrie.yoctoproject.org/#/builders/61/builds/366 > https://valkyrie.yoctoproject.org/#/builders/73/builds/366 > https://valkyrie.yoctoproject.org/#/builders/73/builds/367 I've found two recipes in meta-openembedded where ptests will fail if the patch is removed. Patches for those were just sent to openembedded-devel. I don't understand the issue with acl. The error in the log looks just like if the updated sed substitution was not done. I have not been able to reproduce this, but I'll keep trying. I've resent the series as v2 with Signed-off-by lines, but no other changes. /Ola
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 60339344015..5d6929fe507 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -42,10 +42,13 @@ do_install_ptest() { -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ -i ${D}${PTEST_PATH}/Makefile - sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile - sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile + sed -e "s|^srcdir =.*|srcdir = .|" \ + -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ + -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ + -e "s|^Makefile:.*|Makefile:|" \ + -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -i ${D}${PTEST_PATH}/Makefile + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} cp -rf ${S}/test/ ${D}${PTEST_PATH} }
From: Ola x Nilsson <olani@axis.com> Add a sed substitution for ${PTEST_PATH}/Makefile that transforms TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] --- meta/recipes-support/attr/attr.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)