summaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-01-10 10:37:26 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-01-14 12:24:57 +0100
commit85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd (patch)
treea4f9013c9305941135d6d16fd698cdf2bf542b91 /devtools
parentefa8088663e3917780f9cb257f2366743e9bfe2f (diff)
downloaddpdk-next-eventdev-85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd.zip
dpdk-next-eventdev-85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd.tar.gz
dpdk-next-eventdev-85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd.tar.xz
devtools: fix build check for whether meson has run
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>
Diffstat (limited to 'devtools')
-rwxr-xr-xdevtools/test-meson-builds.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 79109b7..3edc805 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