Changes to make tests pass on Travis.

.clang-format

@@ -0,0 +1,5 @@
+BasedOnStyle: Chromium
+DerivePointerAlignment: false
+IndentCaseLabels: false
+PointerAlignment: Right
+SpaceAfterCStyleCast: true

.travis.yml

@@ -6,19 +6,54 @@ matrix:
   include:
     - os: linux
       dist: trusty
+      python: "2.7"
+    - os: linux
+      dist: trusty
+      python: "3.5"
     - os: osx
       osx_image: xcode7
-
-services:
-  - docker
+      python: "2.7"
+    - os: osx
+      osx_image: xcode7
+      python: "3.5"
+    - os: linux
+      dist: trusty
+      python: "2.7"
+      env: LINT=1
+      before_install:
+        # In case we ever want to use a different version of clang-format:
+        #- wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        #- echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main" | sudo tee -a /etc/apt/sources.list > /dev/null
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq clang-format-3.8
+      install: []
+      script:
+        - .travis/check-git-clang-format-output.sh
+    - os: linux
+      dist: trusty
+      python: "2.7"
+      env: VALGRIND=1
+      before_install:
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq valgrind
+      script:
+        - python src/photon/test/test.py valgrind
 
 install:
-  - ./test/travis-ci/install.sh
+  - ./install-dependencies.sh
+  - ./build.sh
+
+  - cd src/common/lib/python
+  - sudo python setup.py install
+  - cd ../../../..
+
+  - cd src/photon/lib/python
+  - sudo python setup.py install
+  - cd ../../../..
+
+  - source src/plasma/setup-env.sh
 
 script:
-  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python runtest.py'
-  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python array_test.py'
-  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python failure_test.py'
-  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python microbenchmarks.py'
-  - ./test/travis-ci/run_test.sh --docker-only --shm-size=500m --docker-image=ray-project/ray:test-examples 'source setup-env.sh && cd examples/hyperopt && python driver.py'
-  - ./test/travis-ci/run_test.sh --docker-only --shm-size=500m --docker-image=ray-project/ray:test-examples 'source setup-env.sh && cd examples/lbfgs && python driver.py'
+  - python src/common/test/test.py
+  - python src/plasma/test/test.py
+  - python src/photon/test/test.py

.travis/check-git-clang-format-output.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+if [ "$TRAVIS_PULL_REQUEST" == "false" ] ; then
+  # Not in a pull request, so compare against parent commit
+  base_commit="HEAD^"
+  echo "Running clang-format against parent commit $(git rev-parse $base_commit)"
+else
+  base_commit="$TRAVIS_BRANCH"
+  echo "Running clang-format against branch $base_commit, with hash $(git rev-parse $base_commit)"
+fi
+output="$(.travis/git-clang-format --binary clang-format-3.8 --commit $base_commit --diff --exclude .*thirdparty/)"
+if [ "$output" == "no modified files to format" ] || [ "$output" == "clang-format did not modify any files" ] ; then
+  echo "clang-format passed."
+  exit 0
+else
+  echo "clang-format failed:"
+  echo "$output"
+  exit 1
+fi