github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-01-27 20:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update travis, squash history (#265)

Browse Source
This commit is contained in:
Eric 2016-08-02 15:47:29 -06:00 committed by Dominic Hamon
parent 44128d87d2
commit b7f8e355ee
2 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis-setup.sh
View File

@ -1,26 +0,0 @@
#!/usr/bin/env bash
# Before install
sudo add-apt-repository -y ppa:kalakris/cmake
if [ "$STD" = "c++11" ]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
if [ "$CXX" = "clang++" ]; then
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6 main"
fi
fi
sudo apt-get update -qq
# Install
sudo apt-get install -qq cmake
if [ "$STD" = "c++11" ] && [ "$CXX" = "g++" ]; then
sudo apt-get install -qq gcc-4.8 g++-4.8
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
elif [ "$CXX" = "clang++" ]; then
sudo apt-get install -qq clang-3.6
sudo update-alternatives --install /usr/local/bin/clang clang /usr/bin/clang-3.6 90
sudo update-alternatives --install /usr/local/bin/clang++ clang++ /usr/bin/clang++-3.6 90
export PATH=/usr/local/bin:$PATH
fi

17
.travis.yml
View File

@ -1,3 +1,5 @@
sudo: required
dist: trusty
language: cpp
# NOTE: The COMPILER variable is unused. It simply makes the display on
@ -5,22 +7,17 @@ language: cpp
matrix:
include:
- compiler: gcc
env: COMPILER=g++-4.6 STD=c++0x BUILD_TYPE=Coverage
env: COMPILER=g++ STD=c++11 BUILD_TYPE=Coverage
- compiler: gcc
env: COMPILER=g++-4.6 STD=c++0x BUILD_TYPE=Debug
env: COMPILER=g++ STD=c++11 BUILD_TYPE=Debug
- compiler: gcc
env: COMPILER=g++-4.6 STD=c++0x BUILD_TYPE=Release
- compiler: gcc
env: COMPILER=g++-4.8 STD=c++11 BUILD_TYPE=Debug
- compiler: gcc
env: COMPILER=g++-4.8 STD=c++11 BUILD_TYPE=Release
env: COMPILER=g++ STD=c++11 BUILD_TYPE=Release
- compiler: clang
env: COMPILER=clang++-3.6 STD=c++11 BUILD_TYPE=Debug
env: COMPILER=clang++ STD=c++11 BUILD_TYPE=Debug
- compiler: clang
env: COMPILER=clang++-3.6 STD=c++11 BUILD_TYPE=Release
env: COMPILER=clang++ STD=c++11 BUILD_TYPE=Release
before_script:
- source .travis-setup.sh
- mkdir build && cd build
install: