From bdcaed8b63fc6f95096d1684038109190da83b09 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Fri, 8 Jun 2018 14:38:01 +0200 Subject: Add CI testing of both status_code and error_code editions of AFIO. More single file header fixes. --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 6cf66ead..fba93eb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,8 @@ env: global: - secure: "A3TeWTlJdjUaQ31NF60kMOik8mzaJkdKA55jZXjN83BJ2ZjMDmWfq1XmZ7iDIxmn7HC2BVpjhdkj9jpRtPztb08L5VSlJIiVbXlBWNwgzmYANujpR9rA+bhZJwlKDaYQHUZUd4+iGHCHb0dLt2HG0eHF5azaifd0YqCfz5GcWl8=" matrix: - - __="cmake tests" NAME=TravisLinuxWorker + - __="cmake tests (error_code)" NAME=TravisLinuxWorker CMAKE_CONFIGURE_OPTIONS= + - __="cmake tests (status_code)" NAME=TravisLinuxWorker CMAKE_CONFIGURE_OPTIONS=-DAFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - __="cmake tests" NAME=TravisOSXWorker - __="Documentation" NAME=TravisDocumentation - __="Programs" @@ -46,7 +47,8 @@ matrix: - os: osx env: __="Documentation" NAME=TravisDocumentation - os: osx - env: __="cmake tests" NAME=TravisLinuxWorker + env: __="cmake tests (error_code)" NAME=TravisLinuxWorker + env: __="cmake tests (status_code)" NAME=TravisLinuxWorker - os: linux compiler: g++ env: __="Documentation" NAME=TravisDocumentation @@ -75,7 +77,7 @@ before_install: export CXX=/usr/local/opt/llvm/bin/clang++; export LDFLAGS="-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"; export CPPFLAGS=-I/usr/local/opt/llvm/include; - export CMAKE_CONFIGURE_OPTIONS=-DCMAKE_LIBRARY_PATH=/usr/local/opt/llvm/lib; + export CMAKE_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS -DCMAKE_LIBRARY_PATH=/usr/local/opt/llvm/lib; fi - if [ "$CXX" = "g++" ]; then export CXX=g++-6; export NAME=TravisLinuxWorkerGCC; fi; - if [ "$CXX" = "clang++" ]; then export CXX=clang++-4.0; export NAME=TravisLinuxWorkerClang; fi; -- cgit v1.2.3