]> git.droids-corp.org - dpdk.git/commitdiff
devtools: fix build check for whether meson has run
authorBruce Richardson <bruce.richardson@intel.com>
Thu, 10 Jan 2019 10:37:26 +0000 (10:37 +0000)
committerThomas Monjalon <thomas@monjalon.net>
Mon, 14 Jan 2019 11:24:57 +0000 (12:24 +0100)
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>
devtools/test-meson-builds.sh

index 79109b757174006bf5f3fdf77eb4efb246dd8976..3edc805f6546d8db81dc5a13dbdd1d05e9131f72 100755 (executable)
@@ -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