Skip to content

Commit b689a59

Browse files
committed
Travis: add gcc6 as dependency and use it in ble testing
1 parent cc5b192 commit b689a59

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

.travis.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ cache:
2020
- $HOME/.cache/apt
2121
- $HOME/gcc-arm-none-eabi-6-2017-q2-update
2222

23+
addons:
24+
apt:
25+
sources:
26+
- ubuntu-toolchain-r-test
27+
packages:
28+
- gcc-6
29+
- g++-6
30+
- cmake
31+
2332
before_install:
2433
- bash -c "$STATUS" pending "Local $NAME testing is in progress"
2534
# Make sure pipefail
@@ -117,7 +126,7 @@ matrix:
117126

118127
- env:
119128
- NAME=ble-host-tests
120-
- BLE_HOST_TESTS=features/FEATURE_BLE/tests
129+
- BLE_HOST_TESTS=$PWD/features/FEATURE_BLE/tests
121130
install:
122131
# Install dependencies
123132
- sudo apt-get install cmake
@@ -127,8 +136,10 @@ matrix:
127136
script:
128137
# Compile the tests
129138
- mkdir $BLE_HOST_TESTS/build
130-
- cd $BLE_HOST_TESTS/build && cmake .. -G "Unix Makefiles"
131-
- make -C $BLE_HOST_TESTS/build
139+
- cd $BLE_HOST_TESTS/build && CC=gcc-6 CXX=g++-6 cmake .. -G "Unix Makefiles"
140+
- ls $BLE_HOST_TESTS
141+
- ls $BLE_HOST_TESTS/build
142+
- cd $BLE_HOST_TESTS/build && make
132143
# Run ble host tests
133144
- $BLE_HOST_TESTS/build/gatt-client-tests
134145

0 commit comments

Comments
 (0)