Merge pull request #16422 from alalek:issue_16419

5 years ago · 5d01821d9f
parent 5265db82c7 4b2363de5c
commit 5d01821d9f
1 changed files with 7 additions and 3 deletions
--- a/modules/gapi/test/common/gapi_core_tests_inl.hpp
+++ b/modules/gapi/test/common/gapi_core_tests_inl.hpp
@ -120,9 +120,13 @@ TEST_P(MathOpTest, MatricesAccuracyTest)
            CV_MAT_DEPTH(out_mat_ocv.type()) != CV_64F)
        {
            // integral: allow 1% of differences, and no diffs by >1 unit
-            EXPECT_LE(countNonZeroPixels(cv::abs(out_mat_gapi - out_mat_ocv) > 0),
-                                                           0.01*out_mat_ocv.total());
-            EXPECT_LE(countNonZeroPixels(cv::abs(out_mat_gapi - out_mat_ocv) > 1), 0);
+            EXPECT_LE(cvtest::norm(out_mat_gapi, out_mat_ocv, NORM_INF), 1);  // check: abs(a[i] - b[i]) <= 1
+            float tolerance = 0.01f;
+#if defined(__arm__) || defined(__aarch64__)
+            if (opType == DIV)
+                tolerance = 0.05f;
+#endif
+            EXPECT_LE(cvtest::norm(out_mat_gapi, out_mat_ocv, NORM_L1), tolerance*out_mat_ocv.total());
        }
        else
        {