From: yao <bitwangyaoyao@gmail.com>
Date: Mon, 3 Sep 2012 09:23:13 +0000 (+0800)
Subject: A little fix to ocl accuracy tests, make them more uniformed
X-Git-Tag: accepted/2.0/20130307.220821~364^2~223^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8bfc0fd890bdea4ba7f14918c64c78a31c4d9e5;p=profile%2Fivi%2Fopencv.git

A little fix to ocl accuracy tests, make them more uniformed
---

diff --git a/modules/ocl/test/test_canny.cpp b/modules/ocl/test/test_canny.cpp
index 5cb1d00..e728c99 100644
--- a/modules/ocl/test/test_canny.cpp
+++ b/modules/ocl/test/test_canny.cpp
@@ -45,11 +45,7 @@
 
 #include "precomp.hpp"
 
-#ifdef WIN32
-#define FILTER_IMAGE "C:/Users/Public/Pictures/Sample Pictures/Penguins.jpg"
-#else
-#define FILTER_IMAGE "/Users/Test/Valve_original.PNG" // user need to specify a valid image path
-#endif
+#define FILTER_IMAGE "../../../samples/gpu/road.png"
 #define SHOW_RESULT 0
 
 ////////////////////////////////////////////////////////
@@ -107,6 +103,6 @@ TEST_P(Canny, Accuracy)
 	EXPECT_MAT_SIMILAR(edges_gold, edges, 1e-2);
 }
 
-INSTANTIATE_TEST_CASE_P(ocl_ImgProc, Canny, testing::Combine(
+INSTANTIATE_TEST_CASE_P(GPU_ImgProc, Canny, testing::Combine(
     testing::Values(AppertureSize(3), AppertureSize(5)),
     testing::Values(L2gradient(false), L2gradient(true))));
diff --git a/modules/ocl/test/test_hog.cpp b/modules/ocl/test/test_hog.cpp
index 4c2a42f..d4e95a4 100644
--- a/modules/ocl/test/test_hog.cpp
+++ b/modules/ocl/test/test_hog.cpp
@@ -184,7 +184,7 @@ TEST_P(HOG, Detect)
 }
 
 
-INSTANTIATE_TEST_CASE_P(OCL_ObjDetect, HOG, testing::Combine(
+INSTANTIATE_TEST_CASE_P(GPU_ImgProc, HOG, testing::Combine(
                         testing::Values(cv::Size(64, 128), cv::Size(48, 96)),
                         testing::Values(MatType(CV_8UC1), MatType(CV_8UC4))));