diff options
-rw-r--r-- | .travis.yml | 4 | ||||
-rwxr-xr-x | tools/Utils/fix_style_in_project.sh | 34 | ||||
-rwxr-xr-x | tools/infrastructure/check_style.sh (renamed from tools/Utils/check_style.sh) | 0 | ||||
-rwxr-xr-x | tools/infrastructure/collect_coverage.sh (renamed from tools/Utils/collect_coverage.sh) | 0 |
4 files changed, 2 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index 8d9d9c0767..99dcc0e149 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,11 @@ before_install: - sudo dpkg -i lcov_1.11-3_all.deb script: - sudo ln -sf /usr/bin/gcov-4.9 /usr/bin/gcov - - bash -e tools/Utils/check_style.sh + - bash -e tools/infrastructure/check_style.sh - mkdir build && cd build && cmake ../ -DBUILD_TESTS=ON -DENABLE_GCOV=ON && make install - sudo ldconfig - make test - - bash -ex ../tools/Utils/collect_coverage.sh ./ + - bash -ex ../tools/infrastructure/collect_coverage.sh ./ env: global: - LC_CTYPE=en_US.UTF-8 diff --git a/tools/Utils/fix_style_in_project.sh b/tools/Utils/fix_style_in_project.sh deleted file mode 100755 index bf7403d2a3..0000000000 --- a/tools/Utils/fix_style_in_project.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env sh -# Copyright (c) 2016 Ford Motor Company, -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# * Neither the name of Ford Motor Company nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -FILE_NAMES=$(find src -name \*.h -print -o -name \*.cpp -print -o -name \*.cc -print | grep -v 3rd_party) -for FILE_NAME in $FILE_NAMES -do - clang-format-3.6 -style=file -i $FILE_NAME -done diff --git a/tools/Utils/check_style.sh b/tools/infrastructure/check_style.sh index 0b58af3c95..0b58af3c95 100755 --- a/tools/Utils/check_style.sh +++ b/tools/infrastructure/check_style.sh diff --git a/tools/Utils/collect_coverage.sh b/tools/infrastructure/collect_coverage.sh index 47559e6c47..47559e6c47 100755 --- a/tools/Utils/collect_coverage.sh +++ b/tools/infrastructure/collect_coverage.sh |