third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ts: add findDataDirectory() function

Browse Source
This commit is contained in:
Alexander Alekhin 2018-07-23 17:58:10 +03:00 committed by Dmitry Kurtaev
parent 28e08ae0bd
commit 6e767e2376
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ts/include/opencv2/ts.hpp
View File

@ -654,6 +654,11 @@ void addDataSearchSubDirectory(const std::string& subdir);
*/ */
std::string findDataFile(const std::string& relative_path, bool required = true); std::string findDataFile(const std::string& relative_path, bool required = true);
/*! @brief Try to find requested data directory
@sa findDataFile
*/
std::string findDataDirectory(const std::string& relative_path, bool required = true);
#ifndef __CV_TEST_EXEC_ARGS #ifndef __CV_TEST_EXEC_ARGS
#if defined(_MSC_VER) && (_MSC_VER <= 1400) #if defined(_MSC_VER) && (_MSC_VER <= 1400)

32
modules/ts/src/ts.cpp
View File

@ -772,16 +772,24 @@ void addDataSearchSubDirectory(const std::string& subdir)
TS::ptr()->data_search_subdir.push_back(subdir); TS::ptr()->data_search_subdir.push_back(subdir);
} }
std::string findDataFile(const std::string& relative_path, bool required) static std::string findData(const std::string& relative_path, bool required, bool findDirectory)
{ {
#define TEST_TRY_FILE_WITH_PREFIX(prefix) \ #define TEST_TRY_FILE_WITH_PREFIX(prefix) \
{ \ { \
std::string path = path_join(prefix, relative_path); \ std::string path = path_join(prefix, relative_path); \
/*printf("Trying %s\n", path.c_str());*/ \ /*printf("Trying %s\n", path.c_str());*/ \
FILE* f = fopen(path.c_str(), "rb"); \ if (findDirectory) \
if(f) { \ { \
fclose(f); \ if (isDirectory(path)) \
return path; \ return path; \
} \
else \
{ \
FILE* f = fopen(path.c_str(), "rb"); \
if(f) { \
fclose(f); \
return path; \
} \
} \ } \
} }
@ -842,11 +850,21 @@ std::string findDataFile(const std::string& relative_path, bool required)
} }
#endif #endif
#endif #endif
const char* type = findDirectory ? "directory" : "data file";
if (required) if (required)
CV_Error(cv::Error::StsError, cv::format("OpenCV tests: Can't find required data file: %s", relative_path.c_str())); CV_Error(cv::Error::StsError, cv::format("OpenCV tests: Can't find required %s: %s", type, relative_path.c_str()));
throw SkipTestException(cv::format("OpenCV tests: Can't find data file: %s", relative_path.c_str())); throw SkipTestException(cv::format("OpenCV tests: Can't find %s: %s", type, relative_path.c_str()));
} }
std::string findDataFile(const std::string& relative_path, bool required)
{
return findData(relative_path, required, false);
}
std::string findDataDirectory(const std::string& relative_path, bool required)
{
return findData(relative_path, required, true);
}
} //namespace cvtest } //namespace cvtest