* [dpdk-stable] [PATCH] test-meson-build: fix check for whether meson has run
@ 2019-01-10 10:37 Bruce Richardson
2019-01-10 13:10 ` [dpdk-stable] [dpdk-dev] " Luca Boccassi
0 siblings, 1 reply; 3+ messages in thread
From: Bruce Richardson @ 2019-01-10 10:37 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable
The current check to see whether we need to call meson or just ninja
simply checked if the build directory existed. However, if meson was run
but failed, the build directory would still exist. We can fix this by
instead checking for the build.ninja file inside the directory. Once that
is present, we can use ninja safely and let it worry about rerunning
meson if necessary.
Fixes: a55277a788df ("devtools: add test script for meson builds")
CC: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
devtools/test-meson-builds.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 79109b757..3edc805f6 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -24,7 +24,7 @@ build () # <directory> <meson options>
{
builddir=$1
shift
- if [ ! -d "$builddir" ] ; then
+ if [ ! -f "$builddir/build.ninja" ] ; then
options="--werror -Dexamples=all $*"
echo "$MESON $options $srcdir $builddir"
$MESON $options $srcdir $builddir
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH] test-meson-build: fix check for whether meson has run
2019-01-10 10:37 [dpdk-stable] [PATCH] test-meson-build: fix check for whether meson has run Bruce Richardson
@ 2019-01-10 13:10 ` Luca Boccassi
2019-01-14 11:19 ` Thomas Monjalon
0 siblings, 1 reply; 3+ messages in thread
From: Luca Boccassi @ 2019-01-10 13:10 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: stable
On Thu, 2019-01-10 at 10:37 +0000, Bruce Richardson wrote:
> The current check to see whether we need to call meson or just ninja
> simply checked if the build directory existed. However, if meson was
> run
> but failed, the build directory would still exist. We can fix this by
> instead checking for the build.ninja file inside the directory. Once
> that
> is present, we can use ninja safely and let it worry about rerunning
> meson if necessary.
>
> Fixes: a55277a788df ("devtools: add test script for meson builds")
> CC: stable@dpdk.org
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> devtools/test-meson-builds.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-
> builds.sh
> index 79109b757..3edc805f6 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -24,7 +24,7 @@ build () # <directory> <meson options>
> {
> builddir=$1
> shift
> - if [ ! -d "$builddir" ] ; then
> + if [ ! -f "$builddir/build.ninja" ] ; then
> options="--werror -Dexamples=all $*"
> echo "$MESON $options $srcdir $builddir"
> $MESON $options $srcdir $builddir
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH] test-meson-build: fix check for whether meson has run
2019-01-10 13:10 ` [dpdk-stable] [dpdk-dev] " Luca Boccassi
@ 2019-01-14 11:19 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2019-01-14 11:19 UTC (permalink / raw)
To: Bruce Richardson; +Cc: stable, Luca Boccassi, dev
10/01/2019 14:10, Luca Boccassi:
> On Thu, 2019-01-10 at 10:37 +0000, Bruce Richardson wrote:
> > The current check to see whether we need to call meson or just ninja
> > simply checked if the build directory existed. However, if meson was
> > run
> > but failed, the build directory would still exist. We can fix this by
> > instead checking for the build.ninja file inside the directory. Once
> > that
> > is present, we can use ninja safely and let it worry about rerunning
> > meson if necessary.
> >
> > Fixes: a55277a788df ("devtools: add test script for meson builds")
> > CC: stable@dpdk.org
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
>
> Acked-by: Luca Boccassi <bluca@debian.org>
Applied, thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-14 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-10 10:37 [dpdk-stable] [PATCH] test-meson-build: fix check for whether meson has run Bruce Richardson
2019-01-10 13:10 ` [dpdk-stable] [dpdk-dev] " Luca Boccassi
2019-01-14 11:19 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).