From 229b55863347dc346f3ad816e38b84b456ee527c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 02:21:59 +0300 Subject: Use absolute path for launching tests. --- src/main.cpp | 4 ++++ src/test/testmain.cpp | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f704d68c7..1988e5962 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,8 @@ #include "debug.h" +char *selfName = nullptr; + static void printHelp() { using std::endl; @@ -228,6 +230,8 @@ int main(int argc, char *argv[]) LoadLibrary("exchndl.dll"); #endif + selfName = argv[0]; + // Parse command line options Client::Options options; parseOptions(argc, argv, options); diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 712133d41..287eeb706 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -35,14 +35,17 @@ #include "debug.h" +std::string fileName = ""; +extern char *selfName; + +TestMain::TestMain() +{ #ifdef WIN32 - const std::string fileName = "manaplus.exe"; + fileName = "manaplus.exe"; #else - const std::string fileName = "manaplus"; + fileName = selfName; #endif -TestMain::TestMain() -{ log = new Logger; // log->setLogFile(Client::getLocalDataDirectory() // + std::string("/test.log")); -- cgit v1.2.3-70-g09d2