From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luca Boccassi Subject: Re: [PATCH] test-meson-build: fix check for whether meson has run Date: Thu, 10 Jan 2019 13:10:01 +0000 Message-ID: <1547125801.16085.2.camel@debian.org> References: <20190110103726.23231-1-bruce.richardson@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Cc: stable@dpdk.org To: Bruce Richardson , dev@dpdk.org Return-path: In-Reply-To: <20190110103726.23231-1-bruce.richardson@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. >=20 > Fixes: a55277a788df ("devtools: add test script for meson builds") > CC: stable@dpdk.org >=20 > Signed-off-by: Bruce Richardson > --- > =C2=A0devtools/test-meson-builds.sh | 2 +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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 () # > =C2=A0{ > =C2=A0 builddir=3D$1 > =C2=A0 shift > - if [ ! -d "$builddir" ] ; then > + if [ ! -f "$builddir/build.ninja" ] ; then > =C2=A0 options=3D"--werror -Dexamples=3Dall $*" > =C2=A0 echo "$MESON $options $srcdir $builddir" > =C2=A0 $MESON $options $srcdir $builddir Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi