projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1133 from robe2/robe2-pkgconfig-instructions
[openjpeg.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index 6747fe30b969201f0fef981b656f99e4a95863bd..84aeb63e2889d584b376fa0a1534404351bdfff5 100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-23,13
+23,16
@@
matrix:
# Performance test with GCC
- os: linux
compiler: g++
# Performance test with GCC
- os: linux
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
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
+ # "sudo: yes" and "dist: trusty" give us a worker with the AVX2 instruction set
+ sudo: yes
+ dist: trusty
compiler: clang-3.8
compiler: clang-3.8
- # skip tests since Travis doesn't have AVX2 compatible machines
- env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_INSTRUCTION_SETS="-mavx2" OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_SKIP_TESTS=1
+ 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:
addons:
apt:
sources:
@@
-41,6
+44,7
@@
matrix:
# Test multi-threading
- os: linux
compiler: g++
# 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
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_NUM_THREADS=2
# Test 32-bit compilation
@@
-63,14
+67,15
@@
matrix:
- valgrind
# Test under ASAN
- valgrind
# Test under ASAN
- - os: linux
- compiler: clang
- env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
+# 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
# Test with CLang 3.8
- os: linux
compiler: clang-3.8
- 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
+ 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
addons:
apt:
sources:
addons:
apt:
sources:
@@
-111,6
+116,7
@@
matrix:
- os: linux
compiler: g++-4.8
env: OPJ_CI_CC=gcc-4.8 OPJ_CI_CXX=g++-4.8 OPJ_CI_ABI_CHECK=1
- os: linux
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:
addons:
apt:
sources: