[travis] Check code style -- currently checking 0 files

dartsim · Nov 4, 2016 · e5e61bd · e5e61bd
2 parents 3219455 + 6c42f64
commit e5e61bd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -425,19 +425,29 @@ if (CLANG_FORMAT_EXECUTABLE)
     message(STATUS "Looking for clang-format - found")
   endif()
 
-  add_custom_target(format
-                    COMMAND ${CMAKE_COMMAND} -E echo "Formatting code... "
-                    COMMAND ${CLANG_FORMAT_EXECUTABLE} -style=file -i ${formatting_files}
-                    COMMAND ${CMAKE_COMMAND} -E echo "Done."
-                    DEPENDS ${CLANG_FORMAT_EXECUTABLE}
-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/dart)
-
-  add_custom_target(check-format
-                    COMMAND ${CMAKE_COMMAND} -E echo "Checking code format... "
-                    COMMAND ${CMAKE_SOURCE_DIR}/tools/check_format.sh ${CLANG_FORMAT_EXECUTABLE} ${formatting_files}
-                    COMMAND ${CMAKE_COMMAND} -E echo "Done."
-                    DEPENDS ${CLANG_FORMAT_EXECUTABLE}
-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/dart)
+  if ("${formatting_files}")
+    add_custom_target(format
+                      COMMAND ${CMAKE_COMMAND} -E echo "Formatting ${formatting_files_length} files... "
+                      COMMAND ${CLANG_FORMAT_EXECUTABLE} -style=file -i ${formatting_files}
+                      COMMAND ${CMAKE_COMMAND} -E echo "Done."
+                      DEPENDS ${CLANG_FORMAT_EXECUTABLE}
+                      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/dart)
+
+    add_custom_target(check-format
+                      COMMAND ${CMAKE_COMMAND} -E echo "Checking ${formatting_files_length} files... "
+                      COMMAND ${CMAKE_SOURCE_DIR}/tools/check_format.sh ${CLANG_FORMAT_EXECUTABLE} ${formatting_files}
+                      COMMAND ${CMAKE_COMMAND} -E echo "Done."
+                      DEPENDS ${CLANG_FORMAT_EXECUTABLE}
+                      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/dart)
+  else()
+    add_custom_target(format
+                      COMMAND ${CMAKE_COMMAND} -E echo "Formatting ${formatting_files_length} files... "
+                      COMMAND ${CMAKE_COMMAND} -E echo "Done.")
+
+    add_custom_target(check-format
+                      COMMAND ${CMAKE_COMMAND} -E echo "Checking ${formatting_files_length} files... "
+                      COMMAND ${CMAKE_COMMAND} -E echo "Done.")
+  endif()
 
 else()
 

diff --git a/ci/install_linux.sh b/ci/install_linux.sh
@@ -22,6 +22,7 @@ libtinyxml2-dev
 liburdfdom-dev
 liburdfdom-headers-dev
 libopenscenegraph-dev
+clang-format-3.8
 '
 
 sudo apt-get -qq --yes --force-yes install $APT
diff --git a/ci/script.sh b/ci/script.sh
@@ -3,5 +3,6 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$COMPILER" = "CLANG" ]; then exit;
 mkdir build && cd build
 cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_VERBOSE=ON -DDART_TREAT_WARNINGS_AS_ERRORS=ON -DDART_COVERALLS=$COVERALLS ..
 make -j4 tutorials examples tests
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then make check-format; fi
 if [ $COVERALLS = ON ]; then make -j4 coveralls; else make -j4 test; fi
 
diff --git a/tools/check_format.sh b/tools/check_format.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+if [ "$#" -lt 2 ]; then
+  echo "Usage: ./check_format.sh [<file> ...]" >&2
+  exit 0
+fi
+
 num_changes=`$1 -style=file -output-replacements-xml "${@:2}" | grep -c "<replacement "`
 
 if [ "$num_changes" = "0" ]; then