summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-02 06:23:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-03 18:44:58 +0300
commit49631972db5b965413d4bbe36983a8d5bd203183 (patch)
treecb31545521cb4b33e65f8e94e7f2d5cd33e9e7a1 /src/test
parentbe7786e70668c014b19263895a6c8f507ed8161d (diff)
downloadmv-49631972db5b965413d4bbe36983a8d5bd203183.tar.gz
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.bz2
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.xz
mv-49631972db5b965413d4bbe36983a8d5bd203183.zip
Use pathJoin for concatinate some paths.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/testlauncher.cpp4
-rw-r--r--src/test/testmain.cpp4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index b05091ddd..ffb183cd0 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -33,6 +33,8 @@
#include "gui/fonts/font.h"
+#include "utils/stringutils.h"
+
#include "render/graphics.h"
#include "render/vertexes/imagecollection.h"
@@ -65,7 +67,7 @@ TestLauncher::TestLauncher(std::string test) :
mTest(test),
file()
{
- file.open((settings.localDataDir + std::string("/test.log")).c_str(),
+ file.open(pathJoin(settings.localDataDir, "test.log").c_str(),
std::ios::out);
}
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index fad34dbb0..540ec5cf5 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -40,7 +40,7 @@ TestMain::TestMain() :
mConfig()
{
fileName = getSelfName();
- log->setLogFile(settings.localDataDir + std::string("/manaplustest.log"));
+ log->setLogFile(pathJoin(settings.localDataDir, "manaplustest.log"));
}
TestMain::~TestMain()
@@ -320,7 +320,7 @@ int TestMain::readValue(const int ver, int def)
std::string tmp;
int var;
std::ifstream file;
- file.open((settings.localDataDir + std::string("/test.log")).c_str(),
+ file.open(pathJoin(settings.localDataDir, "test.log").c_str(),
std::ios::in);
if (!getline(file, tmp))
{