On Fri, Jun 15, 2018 at 04:01:18PM +0800, Gavin Hu wrote:
> On CentOS, the ninja executable has a different name:
> ninja-build, this patch is to fix the missing command error
> on CentOS as follows:
> ./devtools/test-meson-builds.sh: line 24: ninja: command not found
>
> Fixes: a55277a788 ("devtools: add test script for meson builds")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Gavin Hu <gavin...@arm.com>
> Reviewed-by: Phil Yang <phil.y...@arm.com>
> Reviewed-by: Song Zhu <song....@arm.com>
> ---
> devtools/test-meson-builds.sh | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
> index f2ad05f32..8447c704b 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -10,6 +10,15 @@
> srcdir=$(dirname $(readlink -m $0))/..
> MESON=${MESON:-meson}
>
> +if command -v ninja >/dev/null 2>&1 ; then
> + ninja_cmd=ninja
> +elif command -v ninja-build >/dev/null 2>&1 ; then
> + ninja_cmd=ninja-build
> +else
> + echo "## ERROR: ninja is missing, please install..."
> + exit 1
> +fi
> +
> build () # <directory> <meson options>
> {
> builddir=$1
> @@ -21,7 +30,7 @@ build () # <directory> <meson options>
> unset CC
> fi
> echo "ninja -C $builddir"
> - ninja -C $builddir
> + $ninja_cmd -C $builddir
I think the command-name should be updated in the echo print too. [Perhaps
that can be done on apply]. With that minor change:
Acked-by: Bruce Richardson <bruce.richard...@intel.com>
