Commit c33028e5 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Update to gtest 1.8.0.

parent 5b8d31ea

.gitignore

+2 −2
Original line number Diff line number Diff line 
.idea/

build/

bin/

*.cmake
@@ -9,3 +8,4 @@ CMakeFiles/ 
Makefile

cython_debug/

prrt.cpython*.so

tests/__pycache__/
 
 No newline at end of file

CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ set(CMAKE_CXX_FLAGS "-fstack-protector -fstack-protector-all -Wall -pedantic " ) 
set(CMAKE_CXX_FLAGS_DEBUG "-O2 -Wall -ggdb" )

set(CMAKE_CXX_FLAGS_RELEASE "-Os -Wall" )



set(CMAKE_C_COMPILER /usr/bin/gcc-4.9)

set(CMAKE_CXX_COMPILER /usr/bin/g++-4.9)



enable_testing()

tests/CMakeLists.txt

+2 −3
Original line number Diff line number Diff line 
add_subdirectory(lib/gtest-1.7.0)

add_subdirectory(lib/gtest-1.8.0)

include_directories(SYSTEM ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})



add_executable(prrtTests bitmap_tests.cpp lossGatherer_tests.cpp forward_packet_table_tests.cpp bptree_tests.cpp PrrtBlock_tests.cpp)

set_property(TARGET prrtTests PROPERTY C_STANDARD 99)

target_link_libraries(prrtTests LINK_PUBLIC PRRT UTIL gtest gtest_main)
 
 No newline at end of file
 
target_link_libraries(prrtTests LINK_PUBLIC gtest PRRT UTIL gtest_main)
 
 No newline at end of file

tests/lib/gtest-1.8.0/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Ignore CI build directory

build/

tests/lib/gtest-1.8.0/.travis.yml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
# Build matrix / environment variable are explained on:

# http://about.travis-ci.org/docs/user/build-configuration/

# This file can be validated on:

# http://lint.travis-ci.org/



install:

# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.

- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi

# /usr/bin/clang is 3.4, lets override with modern one.

- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi

- echo ${PATH}

- echo ${CXX}

- ${CXX} --version

- ${CXX} -v

addons:

  apt:

    # List of whitelisted in travis packages for ubuntu-precise can be found here:

    #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise

    # List of whitelisted in travis apt-sources:

    #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json

    sources:

    - ubuntu-toolchain-r-test

    - llvm-toolchain-precise-3.7

    packages:

    - gcc-4.9

    - g++-4.9

    - clang-3.7

    - valgrind

os:

  - linux

  - osx

language: cpp

compiler:

  - gcc

  - clang

script: ./travis.sh

env:

  matrix:

    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE

    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE

    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11  VERBOSE_MAKE=true VERBOSE

#    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false

#    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false

notifications:

  email: false

sudo: false