From 7fd1e7b5298d1c7a115019d6d6b61d3d7224f04a Mon Sep 17 00:00:00 2001 From: Determinant Date: Sat, 3 Feb 2018 20:16:39 -0500 Subject: ... --- .travis.yml | 73 ++++++++++++++++++++++++++++++++++++++++--------------------- Makefile | 4 ++-- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31ebff7..d7971ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,57 @@ language: cpp -compiler: gcc -sudo: required -dist: trusty - matrix: - fast_finish: true - 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" + include: + # works on Precise and Trusty + - os: linux + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: + - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" + + # works on Precise and Trusty + - 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++-5 - env: - - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" + # works on Precise and Trusty + - os: linux + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-6 + env: + - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" + + # works on Precise and Trusty + - os: linux + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 + env: + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" before_install: - - sudo apt-get install libboost-all-dev - eval "${MATRIX_EVAL}" +install: + - sudo apt-get install libboost-all-dev + script: - make + - ./test14 | diff - test_ref.txt + - ./test17 | diff - test_ref.txt diff --git a/Makefile b/Makefile index 3ac8bff..ba6ee2c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: all all: test14 test17 test14: test.cpp promise.hpp - g++ -o $@ test.cpp -std=c++14 -Wall -Wextra -Wpedantic -O2 + $(CXX) -o $@ test.cpp -std=c++14 -Wall -Wextra -Wpedantic -O2 test17: test.cpp promise.hpp - g++ -o $@ test.cpp -std=c++17 -Wall -Wextra -Wpedantic -O2 + $(CXX) -o $@ test.cpp -std=c++17 -Wall -Wextra -Wpedantic -O2 -- cgit v1.2.3