From fbdb239d3a9f19bf1f0e83867c93e148f2435cc0 Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Mon, 20 May 2019 22:15:46 +0200 Subject: [PATCH] also run clang-format checking automatically as unit test --- CMakeLists.txt | 5 ++++- do-clang-format.sh | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d68dc5b19..6d014dffa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,9 +67,12 @@ endif() #add_custom_target (corsika_pre_build) #add_custom_command (TARGET corsika_pre_build PRE_BUILD COMMAND "${PROJECT_SOURCE_DIR}/pre_compile.py") -# add call to do-interaction to run as unit-test-case +# add call to ./do-copyright.py to run as unit-test-case add_test (NAME copyright_notices COMMAND "./do-copyright.py" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +# add call to do-clang-format.sh checking to run as unit-test-case +add_test (NAME clang_format COMMAND ./do-clang-format.sh check WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + find_package (Pythia8) # optional find_package (Eigen3 REQUIRED) diff --git a/do-clang-format.sh b/do-clang-format.sh index c7680e486..ebfcb2322 100755 --- a/do-clang-format.sh +++ b/do-clang-format.sh @@ -1 +1,10 @@ -clang-format -i -style=file `find . -iregex '^.*\.\(cc\|h\)$' -not -path './ThirdParty/*'` +#!/bin/bash + +command="clang-format -style=file `find . -iregex '^.*\.\(cc\|h\)$' -not -path './ThirdParty/*'`" + +if [ "$1" == "check" ]; +then + ! ${command} -output-replacements-xml | grep -c "<replacement " +else + ${command} -i +fi -- GitLab