diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-25 21:29:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 21:29:51 -0700 |
| commit | 9241466921b7bd6ae4915923a5d7af55446abfd1 (patch) | |
| tree | b538b286f4c002955bc53847c5fb1a04540346b9 /ci | |
| parent | 5e13fe66222300eef60d7dc37fdcafbb442cc60f (diff) | |
| parent | 0809c68040ab11b906568e8df72019ce2fe0b049 (diff) | |
| download | googletest-9241466921b7bd6ae4915923a5d7af55446abfd1.tar.gz googletest-9241466921b7bd6ae4915923a5d7af55446abfd1.tar.bz2 googletest-9241466921b7bd6ae4915923a5d7af55446abfd1.zip | |
Merge branch 'master' into appveyor-mingw-enable-tests-again
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test_format.sh | 33 |
1 files changed, 0 insertions, 33 deletions
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 |