0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various fixes to make travis happier

Browse source 
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.
This commit is contained in:
Andreas Löf 2016-06-02 22:37:39 +12:00
parent 102da8c757
commit a3831fead2
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -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

2
src/CMakeLists.txt
View file

@ -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)

2
src/scripting/game_lua_kernel.cpp
View file

@ -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<std::string> area_ids = tod_man().get_area_ids();

3
src/server/server.cpp
View file

@ -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<std::string>(signal_number).c_str();
LOG_SERVER << signame << " caught, exiting without cleanup immediately.\n";
exit(128 + signal_number);
}