From 2d3466be4785560cfc93680e28f9afb92e656665 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Tue, 25 Sep 2018 02:42:15 -0400
Subject: [PATCH 1/2] Add clang format check to one of the builds to provide
 indication that formatting is incorrect

---
 .travis.yml       |  4 +++-
 ci/test-format.sh | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100755 ci/test-format.sh

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

From 76e1045729e2cb0c2050dec056cba5eccd7d9ca5 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Tue, 25 Sep 2018 02:55:08 -0400
Subject: [PATCH 2/2] typo

---
 ci/{test-format.sh => test_format.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ci/{test-format.sh => test_format.sh} (100%)

diff --git a/ci/test-format.sh b/ci/test_format.sh
similarity index 100%
rename from ci/test-format.sh
rename to ci/test_format.sh