summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-05-22 07:28:35 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2017-05-22 07:28:35 +0200
commit05309229b847ea4f289328890176d22c4655348b (patch)
tree0f56abcd32228adf0df9e42e9764decf40f845fa
parent39f4a2f607d44738d60db84eba4b30e3d7450204 (diff)
downloadminetest-05309229b847ea4f289328890176d22c4655348b.tar.gz
minetest-05309229b847ea4f289328890176d22c4655348b.tar.bz2
minetest-05309229b847ea4f289328890176d22c4655348b.zip
LINT fix & check all files with clang-format
Seems the diff mode doesn't work well, PR are detected as working whereas in master it's shown it's problematic (and really problematic). Use same check everywhere
-rw-r--r--src/script/lua_api/l_client.cpp2
-rw-r--r--util/travis/lint.sh8
2 files changed, 2 insertions, 8 deletions
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index 0b7450af2..3c2955bcd 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -88,7 +88,7 @@ int ModApiClient::l_display_chat_message(lua_State *L)
// send_chat_message(message)
int ModApiClient::l_send_chat_message(lua_State *L)
{
- if (!lua_isstring(L,1))
+ if (!lua_isstring(L, 1))
return 0;
std::string message = luaL_checkstring(L, 1);
getClient(L)->sendChatMessage(utf8_to_wide(message));
diff --git a/util/travis/lint.sh b/util/travis/lint.sh
index 4e816bd94..cd5f41779 100644
--- a/util/travis/lint.sh
+++ b/util/travis/lint.sh
@@ -9,13 +9,7 @@ function perform_lint() {
echo "LINT: Using binary $CLANG_FORMAT"
CLANG_FORMAT_WHITELIST="util/travis/clang-format-whitelist.txt"
- if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
- # Get list of every file modified in this pull request
- files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' | true)"
- else
- # Check everything for branch pushes
- files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
- fi
+ files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
local errorcount=0
local fail=0