summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2017-10-04 06:26:36 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2017-10-04 15:02:29 +0000
commit6b6bd9d0b2c33a014f1d33652c6dce5178e9d72e (patch)
tree0019b198055c19c47c8b2bd7d0219e0e0f0bcbe3
parentd867a7cf6baffcebbf1b6e408272ec22dc55dd68 (diff)
checkstyle: add clang-format dependency, fix bug
Change-Id: I608d3b73700d57652b015a9fc09300e99386a37f Signed-off-by: Klement Sekera <ksekera@cisco.com>
-rw-r--r--Makefile2
-rwxr-xr-xbuild-root/scripts/checkstyle.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cf77a411266..b812b2d5911 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ endif
DEB_DEPENDS = curl build-essential autoconf automake bison ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
+DEB_DEPENDS += lcov chrpath autoconf nasm indent clang-format libnuma-dev
DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh
index 6b760b3a440..f4ea79adc6d 100755
--- a/build-root/scripts/checkstyle.sh
+++ b/build-root/scripts/checkstyle.sh
@@ -39,8 +39,8 @@ indent --version
# Check to make sure we have clang-format. Exit if we don't with an error message, but
# don't *fail*.
-command -v clang-format > /dev/null
HAVE_CLANG_FORMAT=0
+command -v clang-format > /dev/null
if [ $? != 0 ]; then
echo "Could not find command \"clang-format\". Checking C++ files will cause abort"
else