Merge pull request #66 from 3Hren/master

.travis.yml

+matrix:
+  include:
+    - os: linux
+      env: SUITE=tests    BUILD_TYPE=Debug   STD=c++0x
+    - os: linux
+      env: SUITE=tests    BUILD_TYPE=Debug   STD=c++11
+    - os: linux
+      env: SUITE=tests    BUILD_TYPE=Release STD=c++0x
+    - os: linux
+      env: SUITE=tests    BUILD_TYPE=Release STD=c++11
+    - os: linux
+      env: SUITE=examples BUILD_TYPE=Debug   STD=c++0x
+    - os: linux
+      env: SUITE=examples BUILD_TYPE=Debug   STD=c++11
+    - os: linux
+      env: SUITE=examples BUILD_TYPE=Release STD=c++0x
+    - os: linux
+      env: SUITE=examples BUILD_TYPE=Release STD=c++11
+    - os: osx
+      env: SUITE=tests    BUILD_TYPE=Debug   STD=c++11
+    - os: osx
+      env: SUITE=tests    BUILD_TYPE=Release STD=c++11
+    - os: osx
+      env: SUITE=examples BUILD_TYPE=Debug   STD=c++11
+    - os: osx
+      env: SUITE=examples BUILD_TYPE=Release STD=c++11
+
+language:
+    - cpp
+
+before_install:
+    - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$STD" = "c++11" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$STD" = "c++11" ]; then sudo apt-get update -qq; fi
+
+install:
+    - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$STD" = "c++11" ]; then sudo apt-get install -qq gcc-4.8 g++-4.8; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$STD" = "c++11" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90; fi
+    
+before_script:
+    - mkdir build && cd build
+
+script:
+    - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="-std=${STD}"
+    - make
+    - if [ "$SUITE" = "tests" ]; then ./test/re_test; fi
+    - if [ "$SUITE" = "examples" ]; then ./test/benchmark_test; fi

AUTHORS

@@ -13,6 +13,7 @@ Christopher Seymour <chris.j.seymour@hotmail.com>
 David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
 Dominic Hamon <dma@stripysock.com>
 Eugene Zhuk <eugene.zhuk@gmail.com>
+Evgeny Safronov <division494@gmail.com>
 Felix Homann <linuxaudio@showlabor.de>
 Google Inc.
 JianXiong Zhou <zhoujianxiong2@gmail.com>

CONTRIBUTORS

@@ -28,6 +28,7 @@ Christopher Seymour <chris.j.seymour@hotmail.com>
 David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
 Dominic Hamon <dma@stripysock.com>
 Eugene Zhuk <eugene.zhuk@gmail.com>
+Evgeny Safronov <division494@gmail.com>
 Felix Homann <linuxaudio@showlabor.de>
 JianXiong Zhou <zhoujianxiong2@gmail.com>
 Lei Xu <eddyxu@gmail.com>

README.md

 benchmark
 =========
+[![Build Status](https://travis-ci.org/google/benchmark.svg?branch=master)](https://travis-ci.org/google/benchmark)
 [![Build Status](https://drone.io/github.com/google/benchmark/status.png)](https://drone.io/github.com/google/benchmark/latest)
 
 A library to support the benchmarking of functions, similar to unit-tests.