From 7503c00b8b61fe3d63cc68e3f82809282320c8c0 Mon Sep 17 00:00:00 2001
From: Aleksandar Fabijanic <alex@pocoproject.org>
Date: Tue, 15 May 2012 02:16:37 +0000
Subject: [PATCH] test files directory detection fix
---
JSON/testsuite/src/JSONTest.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp
index 063c91479..49cd26a74 100644
--- a/JSON/testsuite/src/JSONTest.cpp
+++ b/JSON/testsuite/src/JSONTest.cpp
@@ -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