From 77bc28f36ce739e91649b4e345992b39ffb4f9ac Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 24 Feb 2017 15:15:59 +0100
Subject: [PATCH] Build astyle

---
 ci/travis/code_layout/before_install.sh | 3 ---
 ci/travis/code_layout/install.sh        | 3 +++
 ci/travis/code_layout/script.sh         | 6 +++++-
 scripts/astyle.sh                       | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ci/travis/code_layout/before_install.sh b/ci/travis/code_layout/before_install.sh
index ff65f5cf6a6e..7ae779115a78 100755
--- a/ci/travis/code_layout/before_install.sh
+++ b/ci/travis/code_layout/before_install.sh
@@ -13,7 +13,4 @@
 #                                                                         #
 ###########################################################################
 
-export DEBIAN_FRONTEND=noninteractive
-export CORES=2
-
 pip install autopep8
diff --git a/ci/travis/code_layout/install.sh b/ci/travis/code_layout/install.sh
index 07ddde0c0aaa..f3f3822b7cf6 100755
--- a/ci/travis/code_layout/install.sh
+++ b/ci/travis/code_layout/install.sh
@@ -13,7 +13,10 @@
 #                                                                         #
 ###########################################################################
 
+export CORES=2
+
 mkdir build
 cd build
 
 cmake ../ci/travis/code_layout
+make -j${CORES}
diff --git a/ci/travis/code_layout/script.sh b/ci/travis/code_layout/script.sh
index 1e6270868f65..b49b3c976659 100755
--- a/ci/travis/code_layout/script.sh
+++ b/ci/travis/code_layout/script.sh
@@ -13,6 +13,10 @@
 #                                                                         #
 ###########################################################################
 
-cd build
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
+export QGISSTYLE=${DIR}/scripts/qgisstyle
+
+pushd build
 xvfb-run ctest -V --output-on-failure
+popd
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
index b3db9fa9877b..ca8d0eb20d3c 100755
--- a/scripts/astyle.sh
+++ b/scripts/astyle.sh
@@ -14,7 +14,7 @@
 #                                                                         #
 ###########################################################################
 
-for ASTYLE in $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
+for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
 do
 	if type -p $ASTYLE >/dev/null; then
 		break