Merge pull request #1170 from arrybn:enable_large_models_tests

modules/dnn/test/test_caffe_importer.cpp

@@ -101,6 +101,7 @@ TEST(Reproducibility_AlexNet, Accuracy)
     normAssert(ref, out);
 }
 
+#if !defined(_WIN32) || defined(_WIN64)
 TEST(Reproducibility_FCN, Accuracy)
 {
     Net net;
@@ -126,5 +127,6 @@ TEST(Reproducibility_FCN, Accuracy)
     Mat ref = blobFromNPY(_tf("caffe_fcn8s_prob.npy"));
     normAssert(ref, out);
 }
+#endif
 
 }

modules/dnn/test/test_googlenet.cpp

@@ -68,11 +68,11 @@ static void launchGoogleNetTest()
     }
 
     std::vector<Mat> inpMats;
-    inpMats.push_back( imread(_tf("googlenet_0.jpg")) );
-    inpMats.push_back( imread(_tf("googlenet_1.jpg")) );
+    inpMats.push_back( imread(_tf("googlenet_0.png")) );
+    inpMats.push_back( imread(_tf("googlenet_1.png")) );
     ASSERT_TRUE(!inpMats[0].empty() && !inpMats[1].empty());
 
-    net.setBlob(".data", blobFromImages(inpMats, 1., false));
+    net.setBlob(".data", blobFromImages(inpMats));
     net.forward();
 
     Mat out = net.getBlob("prob");

modules/dnn/test/test_main.cpp

@@ -1,6 +1,15 @@
 #include "test_precomp.hpp"
 
-CV_TEST_MAIN("")
+static const char* extraTestDataPath =
+#ifdef WINRT
+        NULL;
+#else
+        getenv("OPENCV_DNN_TEST_DATA_PATH");
+#endif
+
+CV_TEST_MAIN("",
+    extraTestDataPath ? (void)cvtest::addDataSearchPath(extraTestDataPath) : (void)0
+)
 
 namespace cvtest
 {