From 76e1045729e2cb0c2050dec056cba5eccd7d9ca5 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Tue, 25 Sep 2018 02:55:08 -0400 Subject: typo --- ci/test-format.sh | 33 --------------------------------- ci/test_format.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100755 ci/test-format.sh create mode 100755 ci/test_format.sh (limited to 'ci') diff --git a/ci/test-format.sh b/ci/test-format.sh deleted file mode 100755 index 502c84c5..00000000 --- a/ci/test-format.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -echo "clang-format - checking Code Formatting..." - -if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && \ - [[ "${TEST_CLANG_FORMAT}" == "yes" ]]; then - - RETURN=0 - CLANG_FORMAT="clang-format-3.9" - - which clang-format-3.9 - - if [ ! -f ".clang-format" ]; then - echo ".clang-format file not found!" - exit 1 - fi - - FILES=`git diff master --name-only | grep -E "\.(cc|cpp|h)$"` - - for FILE in $FILES; do - - $CLANG_FORMAT $FILE | cmp $FILE >/dev/null - - if [ $? -ne 0 ]; then - echo "[!] Clang-Format Found INCORRECT FORMATTING. Please re-format and re-submit. The following file failed: $FILE" >&2 - RETURN=1 - fi - - done - - exit $RETURN -fi - -exit 0 diff --git a/ci/test_format.sh b/ci/test_format.sh new file mode 100755 index 00000000..502c84c5 --- /dev/null +++ b/ci/test_format.sh @@ -0,0 +1,33 @@ +#!/bin/bash +echo "clang-format - checking Code Formatting..." + +if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && \ + [[ "${TEST_CLANG_FORMAT}" == "yes" ]]; then + + RETURN=0 + CLANG_FORMAT="clang-format-3.9" + + which clang-format-3.9 + + if [ ! -f ".clang-format" ]; then + echo ".clang-format file not found!" + exit 1 + fi + + FILES=`git diff master --name-only | grep -E "\.(cc|cpp|h)$"` + + for FILE in $FILES; do + + $CLANG_FORMAT $FILE | cmp $FILE >/dev/null + + if [ $? -ne 0 ]; then + echo "[!] Clang-Format Found INCORRECT FORMATTING. Please re-format and re-submit. The following file failed: $FILE" >&2 + RETURN=1 + fi + + done + + exit $RETURN +fi + +exit 0 -- cgit v1.2.3