From 62c18868b2f01b5a7c2b4a4b5dc4c8ac6bc6d441 Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 5 Feb 2014 09:57:53 -0800 Subject: [PATCH 1/4] Added Self Test Plugin At the moment It just shuts the server down again --- MCServer/Plugins/SelfTest/plugin.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 MCServer/Plugins/SelfTest/plugin.lua diff --git a/MCServer/Plugins/SelfTest/plugin.lua b/MCServer/Plugins/SelfTest/plugin.lua new file mode 100644 index 000000000..3822b9ba1 --- /dev/null +++ b/MCServer/Plugins/SelfTest/plugin.lua @@ -0,0 +1,20 @@ + +function Initialize(Plugin) + Plugin:SetName("SelfTest") + Plugin:SetVersion(1) + + cPluginManager.AddHook(cPluginManager.HOOK_WORLD_STARTED, OnWorldStarted) + + LOG("Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion()) + return true +end + + + + + +function OnWorldStarted(World) + LOG("Stopping") + cRoot:Get():QueueExecuteConsoleCommand("stop"); + return false +end From f25597540de890f48a0b4df6feeb7e4c3246efb8 Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 5 Feb 2014 10:10:45 -0800 Subject: [PATCH 2/4] Added support to start up MCServer and then immediatly sut it down in travis --- .travis.yml | 2 +- CMakeLists.txt | 4 ++++ src/Bindings/PluginManager.cpp | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) 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 } From de7e84b45b4564edef674f6fb006b1968a52ac80 Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 5 Feb 2014 10:38:24 -0800 Subject: [PATCH 3/4] Revert "Added Self Test Plugin" This reverts commit 62c18868b2f01b5a7c2b4a4b5dc4c8ac6bc6d441. --- MCServer/Plugins/SelfTest/plugin.lua | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 MCServer/Plugins/SelfTest/plugin.lua diff --git a/MCServer/Plugins/SelfTest/plugin.lua b/MCServer/Plugins/SelfTest/plugin.lua deleted file mode 100644 index 3822b9ba1..000000000 --- a/MCServer/Plugins/SelfTest/plugin.lua +++ /dev/null @@ -1,20 +0,0 @@ - -function Initialize(Plugin) - Plugin:SetName("SelfTest") - Plugin:SetVersion(1) - - cPluginManager.AddHook(cPluginManager.HOOK_WORLD_STARTED, OnWorldStarted) - - LOG("Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion()) - return true -end - - - - - -function OnWorldStarted(World) - LOG("Stopping") - cRoot:Get():QueueExecuteConsoleCommand("stop"); - return false -end From 670213b48d9b175d3c3167b17f03dc1c72b36b33 Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 5 Feb 2014 10:39:33 -0800 Subject: [PATCH 4/4] 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 }