[meta-oe,zeus] rsyslog: fix wrong option of PACKAGECONFIG[valgrind]

Submitted by Haiqing Bai on Sept. 15, 2020, 9:18 a.m. | Patch ID: 176531

Details

Message ID 20200915091850.215655-1-Haiqing.Bai@windriver.com
State Under Review
Delegated to: Armin Kuster
Headers show

Commit Message

Haiqing Bai Sept. 15, 2020, 9:18 a.m.
The source configure.ac shows:
--enable-valgrind: Enable somes special code that rsyslog core developers
                   consider useful for testing.Do NOT use if you don't
                   exactly know what you are doing, except if told so
                   by rsyslog developers.
                   NOT to be used by distro maintainers for building regular
                   packages.

--without-valgrind-testbench:
                   Don't use valgrind in testbench

PACKAGECONFIG[valgrind] should use '--without-valgrind-testbench'
And after this fix, the code which removes the valgrind depended
ptest cases for arm,mips is no longer needed.

Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
index 8287d2b7f..5b8af8d37 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
@@ -74,7 +74,7 @@  PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
 PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"
 PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"
 PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,,"
-PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
+PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind,"
 
 TESTDIR = "tests"
 do_compile_ptest() {
@@ -98,12 +98,6 @@  do_install_ptest() {
     # fix the abs_top_builddir
     sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
 
-    # valgrind is not compatible with arm and mips,
-    # so remove related test cases if there is no valgrind.
-    if [ x${VALGRIND} = x ]; then
-        sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    fi
-
     # install test-driver
     install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
 

Comments

Khem Raj Sept. 15, 2020, 4:15 p.m.
this seems to be applicable on master as well. Can you check if we need 
it on master.

On 9/15/20 2:18 AM, haiqing wrote:
> The source configure.ac shows:
> --enable-valgrind: Enable somes special code that rsyslog core developers
>                     consider useful for testing.Do NOT use if you don't
>                     exactly know what you are doing, except if told so
>                     by rsyslog developers.
>                     NOT to be used by distro maintainers for building regular
>                     packages.
> 
> --without-valgrind-testbench:
>                     Don't use valgrind in testbench
> 
> PACKAGECONFIG[valgrind] should use '--without-valgrind-testbench'
> And after this fix, the code which removes the valgrind depended
> ptest cases for arm,mips is no longer needed.
> 
> Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
> ---
>   meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> index 8287d2b7f..5b8af8d37 100644
> --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> @@ -74,7 +74,7 @@ PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
>   PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"
>   PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"
>   PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,,"
> -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
> +PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind,"
>   
>   TESTDIR = "tests"
>   do_compile_ptest() {
> @@ -98,12 +98,6 @@ do_install_ptest() {
>       # fix the abs_top_builddir
>       sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
>   
> -    # valgrind is not compatible with arm and mips,
> -    # so remove related test cases if there is no valgrind.
> -    if [ x${VALGRIND} = x ]; then
> -        sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
> -    fi
> -
>       # install test-driver
>       install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
>   
> 
> 
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#87102): https://lists.openembedded.org/g/openembedded-devel/message/87102
Mute This Topic: https://lists.openembedded.org/mt/76861173/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Haiqing Bai Sept. 16, 2020, 2:25 a.m.
Yes,  master also need this and the patch can be applied on master.  Thanks.  

-----Original Message-----
From: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> On Behalf Of Khem Raj

Sent: Wednesday, September 16, 2020 12:15 AM
To: Bai, Haiqing <Haiqing.Bai@windriver.com>; openembedded-devel@lists.openembedded.org
Subject: Re: [oe][meta-oe][zeus][PATCH] rsyslog: fix wrong option of PACKAGECONFIG[valgrind]

this seems to be applicable on master as well. Can you check if we need it on master.

On 9/15/20 2:18 AM, haiqing wrote:
> The source configure.ac shows:

> --enable-valgrind: Enable somes special code that rsyslog core developers

>                     consider useful for testing.Do NOT use if you don't

>                     exactly know what you are doing, except if told so

>                     by rsyslog developers.

>                     NOT to be used by distro maintainers for building regular

>                     packages.

> 

> --without-valgrind-testbench:

>                     Don't use valgrind in testbench

> 

> PACKAGECONFIG[valgrind] should use '--without-valgrind-testbench'

> And after this fix, the code which removes the valgrind depended ptest 

> cases for arm,mips is no longer needed.

> 

> Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>

> ---

>   meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | 8 +-------

>   1 file changed, 1 insertion(+), 7 deletions(-)

> 

> diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb 

> b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb

> index 8287d2b7f..5b8af8d37 100644

> --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb

> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb

> @@ -74,7 +74,7 @@ PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"

>   PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"

>   PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"

>   PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,,"

> -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"

> +PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind,"

>   

>   TESTDIR = "tests"

>   do_compile_ptest() {

> @@ -98,12 +98,6 @@ do_install_ptest() {

>       # fix the abs_top_builddir

>       sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' 

> ${D}${PTEST_PATH}/${TESTDIR}/Makefile

>   

> -    # valgrind is not compatible with arm and mips,

> -    # so remove related test cases if there is no valgrind.

> -    if [ x${VALGRIND} = x ]; then

> -        sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile

> -    fi

> -

>       # install test-driver

>       install -m 644 ${S}/test-driver ${D}${PTEST_PATH}

>   

> 

> 

> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87112): https://lists.openembedded.org/g/openembedded-devel/message/87112
Mute This Topic: https://lists.openembedded.org/mt/76861173/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Sept. 16, 2020, 5:03 a.m.
On Tue, Sep 15, 2020 at 7:25 PM Bai, Haiqing <Haiqing.Bai@windriver.com> wrote:
>
> Yes,  master also need this and the patch can be applied on master.  Thanks.
>

I have staged it for master. I think it will be needed on dunfell too Armin.

> -----Original Message-----
> From: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: Wednesday, September 16, 2020 12:15 AM
> To: Bai, Haiqing <Haiqing.Bai@windriver.com>; openembedded-devel@lists.openembedded.org
> Subject: Re: [oe][meta-oe][zeus][PATCH] rsyslog: fix wrong option of PACKAGECONFIG[valgrind]
>
> this seems to be applicable on master as well. Can you check if we need it on master.
>
> On 9/15/20 2:18 AM, haiqing wrote:
> > The source configure.ac shows:
> > --enable-valgrind: Enable somes special code that rsyslog core developers
> >                     consider useful for testing.Do NOT use if you don't
> >                     exactly know what you are doing, except if told so
> >                     by rsyslog developers.
> >                     NOT to be used by distro maintainers for building regular
> >                     packages.
> >
> > --without-valgrind-testbench:
> >                     Don't use valgrind in testbench
> >
> > PACKAGECONFIG[valgrind] should use '--without-valgrind-testbench'
> > And after this fix, the code which removes the valgrind depended ptest
> > cases for arm,mips is no longer needed.
> >
> > Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
> > ---
> >   meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | 8 +-------
> >   1 file changed, 1 insertion(+), 7 deletions(-)
> >
> > diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> > b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> > index 8287d2b7f..5b8af8d37 100644
> > --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> > +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb
> > @@ -74,7 +74,7 @@ PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
> >   PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"
> >   PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"
> >   PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,,"
> > -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
> > +PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind,"
> >
> >   TESTDIR = "tests"
> >   do_compile_ptest() {
> > @@ -98,12 +98,6 @@ do_install_ptest() {
> >       # fix the abs_top_builddir
> >       sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,'
> > ${D}${PTEST_PATH}/${TESTDIR}/Makefile
> >
> > -    # valgrind is not compatible with arm and mips,
> > -    # so remove related test cases if there is no valgrind.
> > -    if [ x${VALGRIND} = x ]; then
> > -        sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
> > -    fi
> > -
> >       # install test-driver
> >       install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
> >
> >
> >
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87114): https://lists.openembedded.org/g/openembedded-devel/message/87114
Mute This Topic: https://lists.openembedded.org/mt/76861173/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-