test files directory detection fix

This commit is contained in:
Aleksandar Fabijanic 2012-05-15 02:16:37 +00:00
parent 97ab4f1926
commit 7503c00b8b

View File

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