From 79367a77601aa1a28b00cbef9e832b670b2032e5 Mon Sep 17 00:00:00 2001
From: Evgenii Zheltonozhskii <zheltonozhskiy@gmail.com>
Date: Wed, 31 Oct 2018 09:27:36 +0200
Subject: [PATCH] Print diff in case of clang-format output
---
.travis/build.sh | 8 +++++++-
modules/clang-cxx-dev-tools.cmake | 7 -------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.travis/build.sh b/.travis/build.sh
index 5eff2fa6f..7e5ed3799 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -5,6 +5,12 @@ set -x
cmake -G Ninja -DCMAKE_BUILD_TYPE=$BUILD_TYPE $EXTRA_CMAKE_FLAGS -DBUILD_TESTING=ON .. || exit 1
# grep returns number of items found. each change is enclosed into <replacement>
# tag in the xml. Thus if no changes needed, 0 will be returned
-cmake --build . --target clang-format-ci -- -v | grep -c "<replacement " && exit 1
+cmake --build . --target clang-format -- -v
+if [[ $(git diff) ]]; then
+ git diff | cat
+ exit 1
+else
+ echo "Success!"
+fi
cmake --build . -- -v || exit 1
ASAN_OPTIONS=alloc_dealloc_mismatch=0 ctest . || exit 1
diff --git a/modules/clang-cxx-dev-tools.cmake b/modules/clang-cxx-dev-tools.cmake
index 3190dd56f..d845ecea9 100644
--- a/modules/clang-cxx-dev-tools.cmake
+++ b/modules/clang-cxx-dev-tools.cmake
@@ -19,13 +19,6 @@ if(CLANG_FORMAT)
-style=file
${ALL_CXX_SOURCE_FILES}
)
- add_custom_target(
- clang-format-ci
- COMMAND clang-format
- -output-replacements-xml
- -style=file
- ${ALL_CXX_SOURCE_FILES}
- )
endif()
# Adding clang-tidy target if executable is found