Skip to content

Commit 198e9b7

Browse files
author
Rob Walker
authored
Turn on unit tests (project-chip#407)
* Turn on unit tests * reduce bootstrap work * restore sub-tests to Travis
1 parent be26243 commit 198e9b7

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

.travis.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ jobs:
2222
- stage: Build
2323
name: "Build NRF Example Lock App"
2424
env: TASK="build-nrf-example-lock-app"
25-
# Disabled given: https://github.com/project-chip/connectedhomeip/issues/385
26-
# - stage: Tests
27-
# name: "Unit & Functional Tests"
28-
# env: TASK="run-unit-and-functional-tests"
29-
# - stage: Tests
30-
# name: "Crypto Tests"
31-
# env: TASK="run-crypto-tests"
25+
- stage: Tests
26+
name: "Unit & Functional Tests"
27+
env: TASK="run-unit-and-functional-tests"
28+
- stage: Tests
29+
name: "Crypto Tests"
30+
env: TASK="run-crypto-tests"
3231
- stage: Tests
3332
name: "Setup Payload Tests"
3433
env: TASK="run-setup-payload-tests"
@@ -38,4 +37,3 @@ jobs:
3837
- stage: Deployment Checks
3938
name: "Distribution Check"
4039
env: TASK="build-distribution-check"
41-

.vscode/tasks.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
{
8888
"label": "Configure",
8989
"type": "shell",
90-
"command": "./bootstrap && mkdir -p build/default && (cd build/default && ../../configure --enable-debug --enable-coverage)",
90+
"command": "mkdir -p build/default && (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage)",
9191
"group": "none",
9292
"problemMatcher": [
9393
"$gcc"
@@ -96,7 +96,7 @@
9696
{
9797
"label": "Bootstrap",
9898
"type": "shell",
99-
"command": "if [[ ! -f build/default/config.status ]]; then ./bootstrap && mkdir -p build/default; (cd build/default && ../../configure --enable-debug --enable-coverage); else ./bootstrap -w make; fi",
99+
"command": "if [[ ! -f build/default/config.status ]]; then mkdir -p build/default; (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage); else ./bootstrap -w make; fi",
100100
"group": "none",
101101
"problemMatcher": [
102102
"$gcc"
@@ -133,7 +133,7 @@
133133
{
134134
"label": "Build nRF5 Lock App",
135135
"type": "shell",
136-
"command": "cd examples/lock-app/nrf5 && make",
136+
"command": "make -C examples/lock-app/nrf5",
137137
"group": "none",
138138
"dependsOn": "Clean Tree",
139139
"problemMatcher": [

integrations/ci-tools/build.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ write_bash_command() {
1616
}
1717

1818
write_bash_bootstrap() {
19-
write_bash_command 'if [[ ! -f build/default/config.status ]]; then ./bootstrap && mkdir -p build/default; (cd build/default && ../../configure --enable-debug --enable-coverage); else ./bootstrap -w make; fi'
19+
write_bash_command 'if [[ ! -f build/default/config.status ]]; then mkdir -p build/default; (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage); else ./bootstrap -w make; fi'
2020
}
2121

2222
docker_run_bash_command() {
@@ -36,8 +36,7 @@ case "$TASK" in
3636

3737
build-nrf-example-lock-app)
3838
write_bash_template
39-
write_bash_bootstrap
40-
write_bash_command 'cd examples/lock-app/nrf5 && make'
39+
write_bash_command 'make -C examples/lock-app/nrf5'
4140
docker_run_bash_command
4241
;;
4342

0 commit comments

Comments
 (0)