X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=.travis.yml;h=769a35350ac42519bb2851669ecae58cf0e31177;hb=943db0f1c28ca6a7df6d18483f97166a03be9bf7;hp=d19eb5f3528ce72768bd5b65e03d66c53082f7db;hpb=05d58451a1221ba95db8fb1d159eb0f76dbafb22;p=openjpeg.git

diff --git a/.travis.yml b/.travis.yml
index d19eb5f3..769a3535 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,84 @@
-language: c
+language: cpp
 
 matrix:
   include:
+# OSX
     - os: osx
       compiler: clang
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1
+
+# Test code style
+    - os: linux
+      compiler: clang-3.8
+      env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_CHECK_STYLE=1 OPJ_CI_SKIP_TESTS=1
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-precise-3.8
+            - ubuntu-toolchain-r-test
+          packages:
+            - clang-3.8
+            - flip
+
+# Performance test with GCC
     - os: linux
-      compiler: gcc
+      compiler: g++
+      dist: precise
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1 OPJ_CI_PERF_TESTS=1
+
+# Test compilation with AVX2
     - os: linux
-      compiler: gcc
+      # "sudo: yes" and "dist: trusty" give us a worker with the AVX2 instruction set
+      sudo: yes
+      dist: trusty
+      compiler: clang-3.8
+      env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_INSTRUCTION_SETS="-mavx2" OPJ_CI_BUILD_CONFIGURATION=Release
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-precise-3.8
+            - ubuntu-toolchain-r-test
+          packages:
+            - clang-3.8
+
+# Test multi-threading
+    - os: linux
+      compiler: g++
+      dist: precise
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_NUM_THREADS=2
+
+# Test 32-bit compilation
     - os: linux
-      compiler: gcc
+      compiler: g++
       env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
+      dist: trusty
       addons:
         apt:
           packages:
             - gcc-multilib
+            - g++-multilib
+
+# Profile code (gcc -pg)
     - os: linux
-      compiler: gcc
+      compiler: g++
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_PROFILE=1
+      dist: trusty
       addons:
         apt:
           packages:
             - valgrind
-    - os: linux
-      compiler: clang
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
+
+# Test under ASAN
+# Temporarily disabled since broken. See https://github.com/uclouvain/openjpeg/issues/1091
+#    - os: linux
+#      compiler: clang
+#      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
+
+# Test with CLang 3.8
     - os: linux
       compiler: clang-3.8
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_PERF_TESTS=1
+      env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_PERF_TESTS=1 OPJ_CI_BUILD_FUZZERS=1
+      dist: trusty
       addons:
         apt:
           sources:
@@ -38,35 +86,49 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - clang-3.8
+
+# Test with mingw 32 bit
     - os: linux
-      compiler: x86_64-w64-mingw32-gcc
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
+      compiler: x86_64-w64-mingw32-g++
+      env: OPJ_CI_CC=x86_64-w64-mingw32-gcc OPJ_CI_CXX=x86_64-w64-mingw32-g++ OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
+      dist: trusty
       addons:
         apt:
           packages:
             - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
+            - binutils-mingw-w64-i686
+            - gcc-mingw-w64-i686
+            - gcc-mingw-w64      
+            - g++-mingw-w64-i686
+            - gcc-multilib
+            - g++-multilib
+
+# Test with mingw 64 bit
     - os: linux
-      compiler: x86_64-w64-mingw32-gcc
-      env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
+      compiler: x86_64-w64-mingw32-g++
+      env: OPJ_CI_CC=x86_64-w64-mingw32-gcc OPJ_CI_CXX=x86_64-w64-mingw32-g++ OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
+      dist: trusty
       addons:
         apt:
           packages:
             - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - gcc-mingw-w64      
+            - binutils-mingw-w64-x86-64
+            - gcc-mingw-w64-x86-64
+            - gcc-mingw-w64
+            - g++-mingw-w64-x86-64
+
+# Test with gcc 4.8
     - os: linux
-      compiler: gcc-4.8
-      env: OPJ_CI_ABI_CHECK=1
+      compiler: g++-4.8
+      env: OPJ_CI_CC=gcc-4.8 OPJ_CI_CXX=g++-4.8 OPJ_CI_ABI_CHECK=1
+      dist: precise
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - gcc-4.8
+            - g++-4.8
             - libelf-dev
             - elfutils
             - texinfo