flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added support to start up MCServer and then immediatly sut it down in travis

Browse Source
This commit is contained in:
Tycho 2014-02-05 10:10:45 -08:00
parent 62c18868b2
commit f25597540d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -3,7 +3,7 @@ compiler:
- gcc - gcc
- clang - clang
# Build MCServer # Build MCServer
script: cmake . -DCMAKE_BUILD_TYPE=RELEASE && make -j 2 script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && ./MCServer
# Notification Settings # Notification Settings
notifications: notifications:

4
CMakeLists.txt
View File

@ -124,6 +124,10 @@ endif()
# The Expat library is linked in statically, make the source files aware of that: # The Expat library is linked in statically, make the source files aware of that:
add_definitions(-DXML_STATIC) add_definitions(-DXML_STATIC)
# Self Test Mode enables extra checks at startup
if(${SELF_TEST})
add_definitions(-DSELF_TEST)
endif()
# Declare the flags used for profiling builds: # Declare the flags used for profiling builds:
if (MSVC) if (MSVC)

4
src/Bindings/PluginManager.cpp
View File

@ -172,6 +172,10 @@ void cPluginManager::InsertDefaultPlugins(cIniFile & a_SettingsIni)
a_SettingsIni.AddValue("Plugins", "Plugin", "Core"); a_SettingsIni.AddValue("Plugins", "Plugin", "Core");
a_SettingsIni.AddValue("Plugins", "Plugin", "TransAPI"); a_SettingsIni.AddValue("Plugins", "Plugin", "TransAPI");
a_SettingsIni.AddValue("Plugins", "Plugin", "ChatLog"); a_SettingsIni.AddValue("Plugins", "Plugin", "ChatLog");
#ifdef SELFTEST
a_SettingsIni.AddValue("Plugins", "Plugin", "SelfTest");
#endif
} }