diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-25 00:12:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 00:12:18 -0700 |
| commit | 5e13fe66222300eef60d7dc37fdcafbb442cc60f (patch) | |
| tree | 5b918cbf3f55a0703dc6ff56a5ccf02e14198c12 | |
| parent | 0e161c3c8bdd448f478953a79210df43650af820 (diff) | |
| parent | b19266a3e3fda6ff9c97b2c1655ef5e7b4444c46 (diff) | |
| download | googletest-5e13fe66222300eef60d7dc37fdcafbb442cc60f.tar.gz googletest-5e13fe66222300eef60d7dc37fdcafbb442cc60f.tar.bz2 googletest-5e13fe66222300eef60d7dc37fdcafbb442cc60f.zip | |
Merge branch 'master' into appveyor-mingw-enable-tests-again
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | ci/test_format.sh | 33 |
2 files changed, 36 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 4ec239fa..d1fe6eb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,9 @@ matrix: - os: linux compiler: clang sudo : true + env: TEST_CLANG_FORMAT="yes" install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/build-linux-bazel.sh + script: ./ci/test_format.sh && ./ci/build-linux-bazel.sh - os: linux group: deprecated-2017Q4 compiler: gcc @@ -65,6 +66,7 @@ addons: packages: - g++-4.9 - clang-3.9 + - clang-format-3.9 notifications: email: false 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 |