Skip to content

Commit a86f1bf

Browse files
committed
travis cmake
1 parent da696a0 commit a86f1bf

File tree

2 files changed

+40
-3
lines changed

2 files changed

+40
-3
lines changed

.travis.yml

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,51 @@ matrix:
1212
include:
1313
-
1414
compiler: gcc
15-
env: COMPILER=g++-5
15+
env:
16+
- COMPILER=g++-5
17+
- MAKE_TASK=cmake-test
18+
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
1619
addons:
1720
apt:
1821
packages:
1922
- git
2023
- g++-5
2124
sources:
2225
- ubuntu-toolchain-r-test
26+
-
27+
compiler: gcc
28+
env:
29+
- COMPILER=g++-5
30+
- MAKE_TASK=cmake-test
31+
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
32+
addons:
33+
apt:
34+
packages:
35+
- git
36+
- g++-5
37+
sources:
38+
- ubuntu-toolchain-r-test
39+
40+
-
41+
compiler: clang
42+
env:
43+
- MAKE_TASK=pio-test
44+
- COMPILER=clang++-3.6
45+
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
46+
addons:
47+
apt:
48+
packages:
49+
- git
50+
- clang-3.6
51+
sources:
52+
- ubuntu-toolchain-r-test
53+
- llvm-toolchain-precise-3.6
2354
-
2455
compiler: clang
25-
env: COMPILER=clang++-3.6
56+
env:
57+
- MAKE_TASK=cmake-test
58+
- COMPILER=clang++-3.6
59+
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
2660
addons:
2761
apt:
2862
packages:
@@ -33,4 +67,4 @@ matrix:
3367
- llvm-toolchain-precise-3.6
3468

3569
script:
36-
- "make pio-test"
70+
- "make $MAKE_TASKS"

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ test:
1919
pio-test:
2020
@pio test
2121

22+
.PHONY: cmake-test
23+
cmake-test: build test
24+
2225
.PHONY: clean
2326
clean:
2427
@rm -rf $(CURDIR)/build/*

0 commit comments

Comments
 (0)