mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-01 02:18:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cuda: fix CUDA tests initialization

Browse Source
This commit is contained in:
Alexander Alekhin 2017-01-12 14:38:47 +03:00
parent f4fdd94cf5
commit f94e64a0ae
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ts/include/opencv2/ts.hpp
View File

@ -604,12 +604,17 @@ void dumpOpenCLDevice();
void parseCustomOptions(int argc, char **argv); void parseCustomOptions(int argc, char **argv);
#define CV_TEST_MAIN(resourcesubdir, ...) \ #define CV_TEST_INIT0_NOOP (void)0
#define CV_TEST_MAIN(resourcesubdir, ...) CV_TEST_MAIN_EX(resourcesubdir, NOOP, __VA_ARGS__)
#define CV_TEST_MAIN_EX(resourcesubdir, INIT0, ...) \
int main(int argc, char **argv) \ int main(int argc, char **argv) \
{ \ { \
using namespace cvtest; \ using namespace cvtest; \
TS* ts = TS::ptr(); \ TS* ts = TS::ptr(); \
ts->init(resourcesubdir); \ ts->init(resourcesubdir); \
__CV_TEST_EXEC_ARGS(CV_TEST_INIT0_ ## INIT0) \
::testing::InitGoogleTest(&argc, argv); \ ::testing::InitGoogleTest(&argc, argv); \
cvtest::printVersionInfo(); \ cvtest::printVersionInfo(); \
TEST_DUMP_OCL_INFO \ TEST_DUMP_OCL_INFO \

6
modules/ts/include/opencv2/ts/cuda_test.hpp
View File

@ -351,8 +351,10 @@ namespace cv { namespace cuda
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#define CV_CUDA_TEST_MAIN(resourcesubdir) \ #define CV_TEST_INIT0_CUDA cvtest::parseCudaDeviceOptions(argc, argv), cvtest::printCudaInfo(), cv::setUseOptimized(false)
CV_TEST_MAIN(resourcesubdir, cvtest::parseCudaDeviceOptions(argc, argv), cvtest::printCudaInfo(), cv::setUseOptimized(false))
#define CV_CUDA_TEST_MAIN(resourcesubdir, ...) \
CV_TEST_MAIN_EX(resourcesubdir, CUDA, __VA_ARGS__)
#else // HAVE_CUDA #else // HAVE_CUDA