Merge branch 4.x

modules/video/test/test_main.cpp

@@ -10,15 +10,7 @@
 static
 void initTests()
 {
-    const char* extraTestDataPath =
-#ifdef WINRT
-        NULL;
-#else
-        getenv("OPENCV_DNN_TEST_DATA_PATH");
-#endif
-    if (extraTestDataPath)
-        cvtest::addDataSearchPath(extraTestDataPath);
-
+    cvtest::addDataSearchEnv("OPENCV_DNN_TEST_DATA_PATH");
     cvtest::addDataSearchSubDirectory("");  // override "cv" prefix below to access without "../dnn" hacks
 }
 

modules/video/test/test_precomp.hpp

@@ -7,6 +7,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/video.hpp"
 #include <opencv2/ts/ts_perf.hpp>
+#include "opencv2/core/utils/configuration.private.hpp"
 
 namespace opencv_test {
 using namespace perf;