Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 1aecc58

Browse files
authored
Merge pull request #1264 from tcm-marcel/fix/address_sanitizer
Change travis configuration to run Address Sanitizer with gcc 5
2 parents a493539 + f430f6b commit 1aecc58

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

.travis.yml

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,50 @@ matrix:
2828
- g++-4.8
2929
env:
3030
# NAME has no actual use, just to make the travis jobs overview more clear
31-
- NAME="gcc4.8 Debug+Tests+Coveralls"
31+
- NAME="gcc4.8 Debug"
3232
- CXX=g++-4.8
3333
- CC=gcc-4.8
3434
- PELOTON_BUILD_TYPE=Debug
3535
# COVERALLS: we run coveralls only for one compiler
36+
- COVERALLS=Off
37+
38+
- os: linux
39+
sudo: required
40+
dist: trusty
41+
compiler: gcc
42+
addons:
43+
apt:
44+
sources:
45+
- llvm-toolchain-precise-3.7
46+
- ubuntu-toolchain-r-test
47+
packages:
48+
- g++-4.8
49+
env:
50+
# NAME has no actual use, just to make the travis jobs overview more clear
51+
- NAME="gcc4.8 Release"
52+
- CXX=g++-4.8
53+
- CC=gcc-4.8
54+
- PELOTON_BUILD_TYPE=Release
55+
- COVERALLS=Off
56+
57+
# Linux builds for gcc 5
58+
- os: linux
59+
sudo: required
60+
dist: trusty
61+
compiler: gcc
62+
addons:
63+
apt:
64+
sources:
65+
- llvm-toolchain-precise-3.7
66+
- ubuntu-toolchain-r-test
67+
packages:
68+
- g++-5
69+
env:
70+
# NAME has no actual use, just to make the travis jobs overview more clear
71+
- NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
72+
- CXX=g++-5
73+
- CC=gcc-5
74+
- PELOTON_BUILD_TYPE=Debug
3675
- COVERALLS=On
3776
# override script value to run also tests and benchmarks
3877
script:
@@ -67,12 +106,12 @@ matrix:
67106
- llvm-toolchain-precise-3.7
68107
- ubuntu-toolchain-r-test
69108
packages:
70-
- g++-4.8
109+
- g++-5
71110
env:
72111
# NAME has no actual use, just to make the travis jobs overview more clear
73-
- NAME="gcc4.8 Release+Tests"
74-
- CXX=g++-4.8
75-
- CC=gcc-4.8
112+
- NAME="gcc5 Release/Tests/AddressSanitizer"
113+
- CXX=g++-5
114+
- CC=gcc-5
76115
- PELOTON_BUILD_TYPE=Release
77116
- COVERALLS=Off
78117
# override script value to run also tests and benchmarks
@@ -96,45 +135,6 @@ matrix:
96135
# run jdbc tests
97136
- python ../script/validators/jdbc_validator.py
98137

99-
# Linux builds for gcc 5
100-
- os: linux
101-
sudo: required
102-
dist: trusty
103-
compiler: gcc
104-
addons:
105-
apt:
106-
sources:
107-
- llvm-toolchain-precise-3.7
108-
- ubuntu-toolchain-r-test
109-
packages:
110-
- g++-5
111-
env:
112-
# NAME has no actual use, just to make the travis jobs overview more clear
113-
- NAME="gcc5 Debug"
114-
- CXX=g++-5
115-
- CC=gcc-5
116-
- PELOTON_BUILD_TYPE=Debug
117-
- COVERALLS=Off
118-
119-
- os: linux
120-
sudo: required
121-
dist: trusty
122-
compiler: gcc
123-
addons:
124-
apt:
125-
sources:
126-
- llvm-toolchain-precise-3.7
127-
- ubuntu-toolchain-r-test
128-
packages:
129-
- g++-5
130-
env:
131-
# NAME has no actual use, just to make the travis jobs overview more clear
132-
- NAME="gcc5 Release"
133-
- CXX=g++-5
134-
- CC=gcc-5
135-
- PELOTON_BUILD_TYPE=Release
136-
- COVERALLS=Off
137-
138138
install:
139139
# setup environment
140140
- ./script/installation/packages.sh

0 commit comments

Comments
 (0)