From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gavin.hu@arm.com>
Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70])
 by dpdk.org (Postfix) with ESMTP id 3A5461E4D1;
 Thu, 14 Jun 2018 11:51:49 +0200 (CEST)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])
 by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A3B9F1529;
 Thu, 14 Jun 2018 02:51:48 -0700 (PDT)
Received: from net-debian.shanghai.arm.com (net-debian.shanghai.arm.com
 [10.169.36.53])
 by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 341103F59D;
 Thu, 14 Jun 2018 02:51:48 -0700 (PDT)
From: Gavin Hu <gavin.hu@arm.com>
To: dev@dpdk.org
Cc: stable@dpdk.org
Date: Thu, 14 Jun 2018 17:51:25 +0800
Message-Id: <20180614095127.16245-6-gavin.hu@arm.com>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <20180614095127.16245-1-gavin.hu@arm.com>
References: <1527590616-28299-1-git-send-email-gavin.hu@arm.com>
 <20180614095127.16245-1-gavin.hu@arm.com>
Subject: [dpdk-stable] [PATCH v6 5/7] devtools: fix the missing ninja
	command error on CentOS
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2018 09:51:49 -0000

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: stable@dpdk.org

Signed-off-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Song Zhu <song.zhu@arm.com>
---
 devtools/test-meson-builds.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 6bce3df7f..4afac76dd 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -21,7 +21,11 @@ build () # <directory> <meson options>
 		$MESON $options $srcdir $builddir
 	fi
 	echo "ninja -C $builddir"
-	ninja -C $builddir
+	if [ "$(lsb_release -d | grep -c 'CentOS')" != "0" ] ; then
+		ninja-build -C $builddir
+	else
+		ninja -C $builddir
+	fi
 }
 
 # shared and static linked builds with gcc and clang
-- 
2.11.0