summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-05 19:10:45 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-05 19:10:45 +0100
commitf25597540de890f48a0b4df6feeb7e4c3246efb8 (patch)
tree0921b5d935743f2180f1a32b91645f3bcc6e6c95
parentAdded Self Test Plugin (diff)
downloadcuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.tar
cuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.tar.gz
cuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.tar.bz2
cuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.tar.lz
cuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.tar.xz
cuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.tar.zst
cuberite-f25597540de890f48a0b4df6feeb7e4c3246efb8.zip
Diffstat (limited to '')
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/Bindings/PluginManager.cpp4
3 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index a41c10b84..c8a2faecb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ compiler:
- gcc
- clang
# 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
notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fee887e7..57b200a2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,10 @@ endif()
# The Expat library is linked in statically, make the source files aware of that:
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:
if (MSVC)
diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index a20583550..f4bae0647 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -172,6 +172,10 @@ void cPluginManager::InsertDefaultPlugins(cIniFile & a_SettingsIni)
a_SettingsIni.AddValue("Plugins", "Plugin", "Core");
a_SettingsIni.AddValue("Plugins", "Plugin", "TransAPI");
a_SettingsIni.AddValue("Plugins", "Plugin", "ChatLog");
+
+ #ifdef SELFTEST
+ a_SettingsIni.AddValue("Plugins", "Plugin", "SelfTest");
+ #endif
}