ocl: skip unstable tests

alalek · alalek · commit 3a8a73ef6c21 · 2017-12-06T12:58:35.000+03:00
during pre-commit testing
diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp
@@ -10,6 +10,7 @@
 
 namespace cvtest {
 void checkIppStatus();
+extern bool skipUnstableTests;
 }
 
 #define CV__TEST_INIT \
diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py
@@ -92,6 +92,9 @@
         if not [a for a in test_args if a.startswith("--perf_verify_sanity")] :
             test_args.extend(["--perf_verify_sanity"])
 
+    if bool(os.environ.get('BUILD_PRECOMMIT', None)):
+        test_args.extend(["--skip_unstable=1"])
+
     ret = 0
     logs = []
     for path in args.build_path:
diff --git a/modules/ts/src/ts.cpp b/modules/ts/src/ts.cpp
@@ -694,11 +694,14 @@ void checkIppStatus()
     }
 }
 
+bool skipUnstableTests = false;
+
 void parseCustomOptions(int argc, char **argv)
 {
     const char * const command_line_keys =
         "{ ipp test_ipp_check |false    |check whether IPP works without failures }"
         "{ test_seed          |809564   |seed for random numbers generator }"
+        "{ skip_unstable      |false    |skip unstable tests }"
         "{ h   help           |false    |print help info                          }";
 
     cv::CommandLineParser parser(argc, argv, command_line_keys);
@@ -717,6 +720,8 @@ void parseCustomOptions(int argc, char **argv)
 #endif
 
     param_seed = parser.get<unsigned int>("test_seed");
+
+    skipUnstableTests = parser.get<bool>("skip_unstable");
 }
 
 
diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp
@@ -999,6 +999,7 @@ void TestBase::Init(const std::vector<std::string> & availableImpls,
         "{   perf_cuda_device            |0        |run CUDA test suite onto specific CUDA capable device}"
         "{   perf_cuda_info_only         |false    |print an information about system and an available CUDA devices and then exit.}"
 #endif
+        "{ skip_unstable                 |false    |skip unstable tests }"
     ;
 
     cv::CommandLineParser args(argc, argv, command_line_keys);
@@ -1097,6 +1098,8 @@ void TestBase::Init(const std::vector<std::string> & availableImpls,
         exit(0);
 #endif
 
+    skipUnstableTests = args.get<bool>("skip_unstable");
+
     if (available_impls.size() > 1)
         printf("[----------]\n[   INFO   ] \tImplementation variant: %s.\n[----------]\n", param_impl.c_str()), fflush(stdout);
 
diff --git a/modules/video/perf/opencl/perf_optflow_pyrlk.cpp b/modules/video/perf/opencl/perf_optflow_pyrlk.cpp
@@ -80,6 +80,15 @@ OCL_PERF_TEST_P(PyrLKOpticalFlowFixture, PyrLKOpticalFlow,
     const PyrLKOpticalFlowParams params = GetParam();
     const int pointsCount = get<0>(params);
 
+    // SKIP unstable tests
+#ifdef __linux__
+    if (cvtest::skipUnstableTests && ocl::useOpenCL())
+    {
+         if (ocl::Device::getDefault().isIntel())
+             throw ::perf::TestBase::PerfSkipTestException();
+    }
+#endif
+
     vector<Point2f> pts;
     goodFeaturesToTrack(frame0, pts, pointsCount, 0.01, 0.0);
     Mat ptsMat(1, static_cast<int>(pts.size()), CV_32FC2, (void *)&pts[0]);
diff --git a/modules/video/test/ocl/test_optflowpyrlk.cpp b/modules/video/test/ocl/test_optflowpyrlk.cpp
@@ -87,6 +87,15 @@ OCL_TEST_P(PyrLKOpticalFlow, Mat)
     ASSERT_FALSE(frame1.empty());
     UMat umatFrame1; frame1.copyTo(umatFrame1);
 
+    // SKIP unstable tests
+#ifdef __linux__
+    if (cvtest::skipUnstableTests && ocl::useOpenCL())
+    {
+         if (ocl::Device::getDefault().isIntel())
+             throw cvtest::SkipTestException("Skip unstable test");
+    }
+#endif
+
     std::vector<cv::Point2f> pts;
     cv::goodFeaturesToTrack(frame0, pts, npoints, 0.01, 0.0);
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace cvtest {`
`12`	`12`	`void checkIppStatus();`
	`13`	`+extern bool skipUnstableTests;`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`#define CV__TEST_INIT \`
Original file line number	Diff line number	Diff line change
`@@ -694,11 +694,14 @@ void checkIppStatus()`
`694`	`694`	`}`
`695`	`695`	`}`
`696`	`696`
	`697`	`+bool skipUnstableTests = false;`
	`698`	`+`
`697`	`699`	`void parseCustomOptions(int argc, char **argv)`
`698`	`700`	`{`
`699`	`701`	`const char * const command_line_keys =`
`700`	`702`	`"{ ipp test_ipp_check \|false \|check whether IPP works without failures }"`
`701`	`703`	`"{ test_seed \|809564 \|seed for random numbers generator }"`
	`704`	`+ "{ skip_unstable \|false \|skip unstable tests }"`
`702`	`705`	`"{ h help \|false \|print help info }";`
`703`	`706`
`704`	`707`	`cv::CommandLineParser parser(argc, argv, command_line_keys);`
`@@ -717,6 +720,8 @@ void parseCustomOptions(int argc, char **argv)`
`717`	`720`	`#endif`
`718`	`721`
`719`	`722`	`param_seed = parser.get<unsigned int>("test_seed");`
	`723`	`+`
	`724`	`+ skipUnstableTests = parser.get<bool>("skip_unstable");`
`720`	`725`	`}`
`721`	`726`
`722`	`727`