manaversetest -> manaplustest

2 files changed, 32 insertions, 32 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ab15f379..f3162021f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,30 +21,30 @@ bin_PROGRAMS =
 endif
 endif
 if ENABLE_UNITTESTSBIN
-bin_PROGRAMS += manaversetests
+bin_PROGRAMS += manaplustests
 endif
 
-manaversetests_CXXFLAGS = 
+manaplustests_CXXFLAGS = 
 if ENABLE_UNITTESTS_CATCH
-manaversetests_CXXFLAGS += -DUNITTESTS_CATCH
+manaplustests_CXXFLAGS += -DUNITTESTS_CATCH
 endif
 if ENABLE_UNITTESTSBIN_CATCH
-manaversetests_CXXFLAGS += -DUNITTESTS_CATCH
+manaplustests_CXXFLAGS += -DUNITTESTS_CATCH
 endif
 if ENABLE_UNITTESTS_DOCTEST
-manaversetests_CXXFLAGS += -DUNITTESTS_DOCTEST
+manaplustests_CXXFLAGS += -DUNITTESTS_DOCTEST
 endif
 if ENABLE_UNITTESTSBIN_DOCTEST
-manaversetests_CXXFLAGS += -DUNITTESTS_DOCTEST
+manaplustests_CXXFLAGS += -DUNITTESTS_DOCTEST
 endif
 if ENABLE_UNITTESTSBIN
 if ENABLE_UNITTESTSBIN_EMBED
-manaversetests_CXXFLAGS += -DUNITTESTS_EMBED
+manaplustests_CXXFLAGS += -DUNITTESTS_EMBED
 endif
 endif
 if ENABLE_UNITTESTS
 if ENABLE_UNITTESTS_EMBED
-manaversetests_CXXFLAGS += -DUNITTESTS_EMBED
+manaplustests_CXXFLAGS += -DUNITTESTS_EMBED
 endif
 endif
 
@@ -2130,47 +2130,47 @@ if ENABLE_MANAPLUSGAME
 manaverse_SOURCES += ${SRC}
 endif
 
-manaversetests_CXXFLAGS += ${manaplus_CXXFLAGS} \
+manaplustests_CXXFLAGS += ${manaplus_CXXFLAGS} \
 	      -DUNITTESTS
-manaversetests_LDFLAGS = 
+manaplustests_LDFLAGS = 
 if ENABLE_PUGIXML
-manaversetests_CXXFLAGS += -DENABLE_PUGIXML
+manaplustests_CXXFLAGS += -DENABLE_PUGIXML
 endif
 if ENABLE_LIBXML
-manaversetests_CXXFLAGS += -DENABLE_LIBXML
+manaplustests_CXXFLAGS += -DENABLE_LIBXML
 endif
 if ENABLE_TINYXML2
-manaversetests_CXXFLAGS += -DENABLE_TINYXML2
+manaplustests_CXXFLAGS += -DENABLE_TINYXML2
 if USE_TINYXML_OLD
-manaversetests_CXXFLAGS += -DUSE_TINYXML_OLD
+manaplustests_CXXFLAGS += -DUSE_TINYXML_OLD
 endif
 endif
 if USE_SDL2
-manaversetests_CXXFLAGS += -DUSE_SDL2
+manaplustests_CXXFLAGS += -DUSE_SDL2
 endif
 if ENABLE_WERROR
-manaversetests_CXXFLAGS += -Werror
+manaplustests_CXXFLAGS += -Werror
 endif
 if ENABLE_ASSERTS
-manaversetests_CXXFLAGS += -DENABLE_ASSERTS
+manaplustests_CXXFLAGS += -DENABLE_ASSERTS
 if HAVE_RDYNAMIC
-manaversetests_LDFLAGS += -rdynamic
+manaplustests_LDFLAGS += -rdynamic
 endif
 endif
 if HAVE_EXECINFO
-manaversetests_CXXFLAGS += -DHAVE_EXECINFO
+manaplustests_CXXFLAGS += -DHAVE_EXECINFO
 endif
 if ENABLE_GLIBCDEBUG
-manaversetests_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
+manaplustests_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
 endif
 if USE_X11
-manaversetests_CXXFLAGS += -DUSE_X11
+manaplustests_CXXFLAGS += -DUSE_X11
 endif
 if ENABLE_OPENGLERRORS
-manaversetests_CXXFLAGS += -DOPENGLERRORS
+manaplustests_CXXFLAGS += -DOPENGLERRORS
 endif
 
-manaversetests_SOURCES = \
+manaplustests_SOURCES = \
 	      unittests/unittests.h \
 	      unittests/enums/render/mockdrawtype.h \
 	      unittests/render/mockdrawitem.h \
@@ -2183,20 +2183,20 @@ manaversetests_SOURCES = \
 	      unittests/utils/checkutils.cc
 
 if ENABLE_UNITTESTS_CATCH
-manaversetests_SOURCES += \
+manaplustests_SOURCES += \
 	      unittests/catch.hpp
 endif
 if ENABLE_UNITTESTS_DOCTEST
-manaversetests_SOURCES += \
+manaplustests_SOURCES += \
 	      unittests/doctest.h
 endif
 
 if MINGW
-manaversetests_SOURCES += manaplus.rc
-manaversetests_LDFLAGS += -mconsole
+manaplustests_SOURCES += manaplus.rc
+manaplustests_LDFLAGS += -mconsole
 endif
 
-manaversetests_SOURCES += \
+manaplustests_SOURCES += \
 	      unittests/fs/virtfs/virtfs1_basic.cc \
 	      unittests/fs/virtfs/virtfs1_enumerate.cc \
 	      unittests/fs/virtfs/virtfs1_exists.cc \
@@ -2244,11 +2244,11 @@ manaversetests_SOURCES += \
 	      unittests/utils/itemxmlutils.cc \
 	      unittests/gui/windowmanager.cc
 
-manaversetests_SOURCES += ${SRC}
+manaplustests_SOURCES += ${SRC}
 
 if ENABLE_UNITTESTS
-TESTS = manaversetests
-check_PROGRAMS = manaversetests
+TESTS = manaplustests
+check_PROGRAMS = manaplustests
 endif
 
 EXTRA_DIST = CMakeLists.txt \
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index da38a1a7c..233b2a3f7 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -43,7 +43,7 @@ TestMain::TestMain() :
     mConfig()
 {
     fileName = getSelfName();
-    log->setLogFile(pathJoin(settings.localDataDir, "manaversetest.log"));
+    log->setLogFile(pathJoin(settings.localDataDir, "manaplustest.log"));
 }
 
 TestMain::~TestMain()