1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

Merge pull request #9770 from alalek:refactor_test_files

This commit is contained in:
Alexander Alekhin
2018-02-06 09:33:57 +00:00
434 changed files with 2014 additions and 2374 deletions
+3 -7
View File
@@ -8,11 +8,7 @@
#include "test_precomp.hpp"
#include "opencv2/core/ocl.hpp"
namespace cvtest {
using namespace cv;
using namespace dnn;
using namespace testing;
namespace opencv_test { namespace {
CV_ENUM(DNNBackend, DNN_BACKEND_DEFAULT, DNN_BACKEND_HALIDE, DNN_BACKEND_INFERENCE_ENGINE)
CV_ENUM(DNNTarget, DNN_TARGET_CPU, DNN_TARGET_OPENCL)
@@ -224,6 +220,6 @@ const tuple<DNNBackend, DNNTarget> testCases[] = {
tuple<DNNBackend, DNNTarget>(DNN_BACKEND_DEFAULT, DNN_TARGET_OPENCL)
};
INSTANTIATE_TEST_CASE_P(/*nothing*/, DNNTestNetwork, ValuesIn(testCases));
INSTANTIATE_TEST_CASE_P(/*nothing*/, DNNTestNetwork, testing::ValuesIn(testCases));
} // namespace cvtest
}} // namespace