CI attemp 5 (travis)

esa · Sep 10, 2019 · a5843c3 · a5843c3
1 parent d052419
commit a5843c3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
   #  sudo: required
   #  services:
   #  - docker
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC48"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="Debug"
     dist: bionic
     compiler: gcc
     os: linux
@@ -34,10 +34,8 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
         packages:
-        - gcc-4.8
-        - g++-4.8
         - binutils-gold
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="ReleaseGCC48"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="Release"
     dist: bionic
     compiler: gcc
     os: linux
@@ -46,10 +44,8 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
         packages:
-        - gcc-4.8
-        - g++-4.8
         - binutils-gold
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="CoverageGCC5"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="Coverage"
     dist: bionic
     compiler: gcc
     os: linux
@@ -58,32 +54,26 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
         packages:
-        - gcc-5
-        - g++-5
         - binutils-gold
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC6"
-    dist: bionic
-    compiler: gcc
-    os: linux
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        packages:
-        - gcc-6
-        - g++-6
-        - binutils-gold
-  - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugClang38"
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugClang"
     dist: bionic
     compiler: clang
     os: linux
     addons:
       apt:
         sources:
-        - llvm-toolchain-precise-3.8
         - ubuntu-toolchain-r-test
         packages:
-        - clang-3.8
+        - clang-7
+
+
+
+env:
+  # may need to be under 'global:' or 'matrix:' if 'env:' is on top level,
+  # see https://docs.travis-ci.com/user/environment-variables/
+  # Or just 'export' them in the script
+   - CC=clang-7
+     CXX=clang++-7
   #- env: PAGMO_PLUGINS_NONFREE_BUILD="ReleaseClang38"
   #  compiler: clang
   #  os: linux

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(worhp_c SHARED ../include/pagmo_plugins_nonfree/bogus_libs/worhp_lib
 
 function(ADD_PAGMO_PLUGINS_TESTCASE arg1)
     add_executable(${arg1} ${arg1}.cpp)
-    target_link_libraries(${arg1} pagmo_plugins_nonfree)
+    target_link_libraries(${arg1} pagmo_plugins_nonfree Boost::unit_test_framework)
     target_compile_options(${arg1} PRIVATE "$<$<CONFIG:DEBUG>:${PAGMO_PLUGINS_NONFREE_CXX_FLAGS_DEBUG}>" "$<$<CONFIG:RELEASE>:${PAGMO_PLUGINS_NONFREE_CXX_FLAGS_RELEASE}>")
     set_property(TARGET ${arg1} PROPERTY CXX_STANDARD 11)
     set_property(TARGET ${arg1} PROPERTY CXX_STANDARD_REQUIRED YES)