Skip to content

Commit 80ed251

Browse files
committed
Merge branch 'fix_travis_astyle_files' of https://github.com/0xc0170/mbed-os into dev_rollup
2 parents b9ea30a + c1d00df commit 80ed251

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ matrix:
141141
after_success:
142142
# run astyle for all files on the branch
143143
- git checkout -- .
144-
- find -regex '.*\.\(h\|c\|hpp\|cpp\)' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
144+
- find -regex '.*\.\(h\|c\|hpp\|cpp\)$' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
145145
# update status if we succeeded, compare with master if possible
146146
- |
147147
CURR=$(cat astyle-branch.out | grep Formatted | wc -l)

TESTS/network/wifi/wifi_connect_params_null.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void wifi_connect_params_null(void)
3030
error = wifi->connect(NULL, NULL);
3131
wifi->disconnect();
3232
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
33-
error = wifi->connect("", "");
33+
error = wifi->connect("", "");
3434
wifi->disconnect();
3535
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
3636
}

TESTS/network/wifi/wifi_connect_secure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void wifi_connect_secure(void)
3232
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security()));
3333

3434
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
35-
35+
3636
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->disconnect());
3737
}
3838

0 commit comments

Comments
 (0)