From a3831fead2db25b7573e010d05507345c68638d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20L=C3=B6f?= Date: Thu, 2 Jun 2016 22:37:39 +1200 Subject: [PATCH] Various fixes to make travis happier Take out the clag to suppress warnings for lua in clang as it's not needed. Make cmake builds in travis verbose. Fix uninitialised variables that clang picks up on in cmake builds. --- .travis.yml | 2 +- src/CMakeLists.txt | 2 +- src/scripting/game_lua_kernel.cpp | 2 +- src/server/server.cpp | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97aff19ff464..6dcf522715d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ script: - ./utils/travis/utf8_bom_dog.sh - $CXX --version - if [ "$USE_CMAKE" = false ]; then scons cxxtool=$CXX --debug=time build=release extra_flags_config=-pipe extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx_std=$CXXSTD nls=$NLS jobs=2; fi - - if [ "$USE_CMAKE" = true ]; then cmake . -DENABLE_STRICT_COMPILATION=$STRICT_COMPILATION -DENABLE_NLS=$NLS -DENABLE_TESTS=$CPP_TESTS && make -j2; fi + - if [ "$USE_CMAKE" = true ]; then cmake . -DENABLE_STRICT_COMPILATION=$STRICT_COMPILATION -DENABLE_NLS=$NLS -DENABLE_TESTS=$CPP_TESTS && make VERBOSE=1 -j2; fi - "export DISPLAY=:99.0" - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24" - if [ "$CPP_TESTS" = true ]; then ./utils/travis/test_wrapper.sh; fi diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea2fdbeac46f..b35fcb0756c6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -361,7 +361,7 @@ if(UNIX AND NOT CMAKE_COMPILER_IS_GNUCXX) set_source_files_properties( ${libwesnoth-lua_STAT_SRC} PROPERTIES COMPILE_FLAGS - "-x c++ -Wno-parentheses-equality -Wno-conditional-uninitialized" + "-x c++ -Wno-parentheses-equality" ) endif(UNIX AND NOT CMAKE_COMPILER_IS_GNUCXX) diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 1fd63efa9dfc..4e3018af845b 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -4047,7 +4047,7 @@ int game_lua_kernel::intf_set_time_of_day(lua_State * L) return 0; } std::string area_id; - size_t area_i; + size_t area_i = 0; if (lua_isstring(L, 2)) { area_id = lua_tostring(L, 1); std::vector area_ids = tod_man().get_area_ids(); diff --git a/src/server/server.cpp b/src/server/server.cpp index 5110cd26086f..c71eabaf68e7 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -445,7 +445,8 @@ void server::handle_termination(const boost::system::error_code& error, int sign const char* signame; if(signal_number == SIGINT) signame = "SIGINT"; - if(signal_number == SIGTERM) signame = "SIGTERM"; + else if(signal_number == SIGTERM) signame = "SIGTERM"; + else signame = lexical_cast(signal_number).c_str(); LOG_SERVER << signame << " caught, exiting without cleanup immediately.\n"; exit(128 + signal_number); }