generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-01 09:24:55 +02:00
Code Issues Projects Releases Wiki Activity

test files directory detection fix

Browse Source
This commit is contained in:
Aleksandar Fabijanic 2012-05-15 02:16:37 +00:00
parent 97ab4f1926
commit 7503c00b8b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
JSON/testsuite/src/JSONTest.cpp
View File

@ -822,15 +822,16 @@ std::string JSONTest::getTestFilesPath(const std::string& type)
std::string validDir(ostr.str()); std::string validDir(ostr.str());
Poco::Path pathPattern(validDir); Poco::Path pathPattern(validDir);
if (Poco::File(pathPattern).exists()) if (Poco::File(pathPattern).exists())
validDir += '*';
else
{ {
ostr.str(""); validDir += '*';
ostr << "/JSON/testsuite/testfiles/" << type << '/'; return validDir;
validDir = Poco::Environment::get("POCO_BASE") + ostr.str();
pathPattern = validDir;
} }
ostr.str("");
ostr << "/JSON/testsuite/testfiles/" << type << '/';
validDir = Poco::Environment::get("POCO_BASE") + ostr.str();
pathPattern = validDir;
if (Poco::File(pathPattern).exists()) if (Poco::File(pathPattern).exists())
validDir += '*'; validDir += '*';
else else