From 68e46d4eb419dd8fcbc6ae340640069e1518d4bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 19 Jul 2002 14:14:18 +0000 Subject: [PATCH] Made the lib directory in the directory of the tester executable the default search dir for test add-ons. It was ./lib before, which didn't allow you to run the tester from another directory. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@335 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/UnitTester.cpp | 3 ++- src/tests/UnitTester.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/UnitTester.cpp b/src/tests/UnitTester.cpp index ecd503ae22..529f1a29b0 100644 --- a/src/tests/UnitTester.cpp +++ b/src/tests/UnitTester.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) { return shell.Run(argc, argv); } -const std::string UnitTesterShell::defaultLibDir = "./lib"; +//const std::string UnitTesterShell::defaultLibDir = "./lib"; UnitTesterShell::UnitTesterShell(const std::string &description, SyncObject *syncObject) : BTestShell(description, syncObject) @@ -71,6 +71,7 @@ UnitTesterShell::ProcessArgument(std::string arg, int argc, char *argv[]) { void UnitTesterShell::LoadDynamicSuites() { // Add the appropriate test lib path + string defaultLibDir = string(GlobalTestDir()) + "/lib"; fLibDirs.insert(defaultLibDir + (doR5Tests ? "_r5" : "")); // Load away diff --git a/src/tests/UnitTester.h b/src/tests/UnitTester.h index e387acb915..7ee8463f54 100644 --- a/src/tests/UnitTester.h +++ b/src/tests/UnitTester.h @@ -8,7 +8,7 @@ class UnitTesterShell : public BTestShell { public: UnitTesterShell(const std::string &description = "", SyncObject *syncObject = 0); protected: - static const std::string defaultLibDir; +// static const std::string defaultLibDir; bool doR5Tests; virtual void PrintDescription(int argc, char *argv[]); virtual void PrintValidArguments();