make travis use gcc

This commit is contained in:
Shane Grant 2017-08-24 19:56:42 -07:00
parent 123eeb55d6
commit 7c65494566
2 changed files with 34 additions and 8 deletions

View File

@ -12,22 +12,48 @@ addons:
- 'g++-multilib'
- 'libboost-serialization-dev'
# - 'libboost-test-dev'
compiler:
- gcc
matrix:
include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
env:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
- os: linux
compiler: clang
env: CMAKE_OPTIONS="-DSKIP_PORTABILITY_TEST=ON"
# TODO: Add an entry for valgrind
# after_script: make valgrind
- os: osx
osx_image: xcode8
compiler: clang
# TODO: Add an entry for valgrind
# after_script: make valgrind
script:
- mkdir build && cd build

View File

@ -145,7 +145,7 @@ void test_defer()
for( auto & node : o_nodes0 )
{
node->relations.resize( 1 );//random_index( 0, 100, gen ) );
node->relations.resize( random_index( 0, 100, gen ) );
for( auto & r : node->relations )
r = {o_nodes0[random_index(0, o_nodes0.size() - 1, gen)],
random_value<int>(gen), random_basic_string<char>(gen)};