Merge branch 'master' of github.com:root-mirror/root into GenVector-AddTemplates

Author: cjones051073

.clang-format

@@ -33,7 +33,7 @@ BraceWrapping:
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
-BreakBeforeBinaryOperators: None
+BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false

.travis.yml

@@ -0,0 +1,59 @@
+sudo: false
+
+language: cpp
+
+addons: &addons
+  apt:
+    packages: timeout
+    sources: &sources
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.9
+
+cache:
+  apt: true
+  ccache: true
+
+# Do not build our sync branch.
+branches:
+  only:
+    - master
+
+matrix:
+  # Abort all builds on a single failing matrix entry.
+  fast_finish: true
+
+  include:
+    # There seems to be a hard limit to how many machines a Travis build will
+    # across all platforms. By interleaving OS X, the hope is to get in the
+    # queue faster while not blocking Linux builds from occuring.
+    - os: linux
+      addons:
+        apt:
+          sources: *sources
+          packages: ['clang-format-3.9']
+      compiler: clang
+
+script:
+- |
+  if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    BASE_COMMIT=$(git rev-parse $TRAVIS_BRANCH)
+    echo "Running clang-format-3.9 against branch $TRAVIS_BRANCH, with hash $BASE_COMMIT"
+    RESULT_OUTPUT="$(git-clang-format-3.9 --commit $BASE_COMMIT --diff --binary `which clang-format-3.9`)"
+    
+    if [ "$RESULT_OUTPUT" == "no modified files to format" ] \
+      || [ "$RESULT_OUTPUT" == "clang-format did not modify any files" ] ; then
+
+      echo "clang-format passed."
+      exit 0
+    else
+      echo "clang-format failed:"
+      echo "To reproduce it locally please run git-clang-format-3.9 --commit $BASE_COMMIT --diff --binary \`which clang-format-3.9\`"
+      echo "$RESULT_OUTPUT"
+      exit 1
+    fi
+  fi
+
+on_failure:
+  -|
+  echo "Showing current directory contents"
+  ls -la