From 670213b48d9b175d3c3167b17f03dc1c72b36b33 Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 5 Feb 2014 10:39:33 -0800 Subject: Simplified shutdown --- .travis.yml | 2 +- src/Bindings/PluginManager.cpp | 4 ---- 2 files changed, 1 insertion(+), 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 } -- cgit v1.2.3