From ac30620344de8a536e186701737c2631b77efd7e Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sun, 19 Jan 2020 16:09:40 +0000 Subject: [PATCH] ts: move message about misused 'optional' under the configuration parameter --- modules/ts/src/ts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ts/src/ts.cpp b/modules/ts/src/ts.cpp index 99f684d054..d319ec1d7b 100644 --- a/modules/ts/src/ts.cpp +++ b/modules/ts/src/ts.cpp @@ -1008,10 +1008,10 @@ static std::string findData(const std::string& relative_path, bool required, boo CHECK_FILE_WITH_PREFIX(prefix, result_); if (!required && !result_.empty()) { - std::cout << "TEST ERROR: Don't use 'optional' findData() for " << relative_path << std::endl; static bool checkOptionalFlag = cv::utils::getConfigurationParameterBool("OPENCV_TEST_CHECK_OPTIONAL_DATA", false); if (checkOptionalFlag) { + std::cout << "TEST ERROR: Don't use 'optional' findData() for " << relative_path << std::endl; CV_Assert(required || result_.empty()); } }