summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-05 19:39:33 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-05 19:39:33 +0100
commit670213b48d9b175d3c3167b17f03dc1c72b36b33 (patch)
treeee671fcc52f43fb663b12efd67f84ebc288a0d7a
parentRevert "Added Self Test Plugin" (diff)
downloadcuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.tar
cuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.tar.gz
cuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.tar.bz2
cuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.tar.lz
cuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.tar.xz
cuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.tar.zst
cuberite-670213b48d9b175d3c3167b17f03dc1c72b36b33.zip
-rw-r--r--.travis.yml2
-rw-r--r--src/Bindings/PluginManager.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index c8a2faecb..38dd2f280 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ compiler:
- gcc
- clang
# Build MCServer
-script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && ./MCServer
+script: cmake . -DCMAKE_BUILD_TYPE=RELEASE -DSELF_TEST=1 && make -j 2 && cd MCServer/ && (echo stop | ./MCServer)
# Notification Settings
notifications:
diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index f4bae0647..a20583550 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -172,10 +172,6 @@ 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
}