minor gpu tests fix

2012-08-20 10:15:36 +04:00
parent a0aef244d6
commit ec7f9566e0
26 changed files with 134 additions and 195 deletions
--- a/modules/gpu/test/utility.hpp
+++ b/modules/gpu/test/utility.hpp
@@ -94,9 +94,7 @@ private:
    std::vector<cv::gpu::DeviceInfo> devices_;
 };

-testing::internal::ParamGenerator<cv::gpu::DeviceInfo> DevicesGenerator_();
-
-#define ALL_DEVICES DevicesGenerator_()
+#define ALL_DEVICES testing::ValuesIn(DeviceManager::instance().values())

 //////////////////////////////////////////////////////////////////////
 // Additional assertion