diff options
| author | Mattes D <github@xoft.cz> | 2016-06-19 14:57:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 14:57:14 +0200 |
| commit | 5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7 (patch) | |
| tree | 083bbf9029b971dbf7b74353c9c62c22de9c78c7 /tests/LoadablePieces | |
| parent | Merge pull request #3224 from QUSpilPrgm/master (diff) | |
| parent | cNetwork: Fixed possible hang when terminating immediately after init. (diff) | |
| download | cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.tar cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.tar.gz cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.tar.bz2 cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.tar.lz cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.tar.xz cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.tar.zst cuberite-5ee6643804aa9cf5bc2a98b983ef7c453e78b8c7.zip | |
Diffstat (limited to 'tests/LoadablePieces')
| -rw-r--r-- | tests/LoadablePieces/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/LoadablePieces/LoadablePieces.cpp | 2 | ||||
| -rw-r--r-- | tests/LoadablePieces/Stubs.cpp | 28 |
3 files changed, 7 insertions, 28 deletions
diff --git a/tests/LoadablePieces/CMakeLists.txt b/tests/LoadablePieces/CMakeLists.txt index 16a89633a..c467d7c38 100644 --- a/tests/LoadablePieces/CMakeLists.txt +++ b/tests/LoadablePieces/CMakeLists.txt @@ -98,3 +98,8 @@ add_test(NAME LoadablePieces-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +# Put the projects into solution folders (MSVC): +set_target_properties( + LoadablePieces + PROPERTIES FOLDER Tests +) diff --git a/tests/LoadablePieces/LoadablePieces.cpp b/tests/LoadablePieces/LoadablePieces.cpp index cce43eee1..c4c44e3db 100644 --- a/tests/LoadablePieces/LoadablePieces.cpp +++ b/tests/LoadablePieces/LoadablePieces.cpp @@ -41,6 +41,8 @@ static int DoTest(void) int main(int argc, char * argv[]) { + LOGD("Test started"); + // Print the current directory for reference: char folder[FILENAME_MAX]; GetCurrentFolder(folder, sizeof(folder)); diff --git a/tests/LoadablePieces/Stubs.cpp b/tests/LoadablePieces/Stubs.cpp index 5fbd7b599..717b5679c 100644 --- a/tests/LoadablePieces/Stubs.cpp +++ b/tests/LoadablePieces/Stubs.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "BlockInfo.h" -#include "SelfTests.h" #include "Bindings.h" #include "Bindings/DeprecatedBindings.h" #include "Bindings/LuaJson.h" @@ -272,30 +271,3 @@ cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE - -cSelfTests::cSelfTests(void): - m_AllowRegistering(true) -{ -} - - - - - -cSelfTests & cSelfTests::Get(void) -{ - static cSelfTests singleton; - return singleton; -} - - - - - -void cSelfTests::Register(cSelfTests::SelfTestFunction a_TestFn, const AString & a_TestName) -{ -} - - - - |