From d696fac8b8e109a6b80d519cdf2e5288ea8d698e Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 26 Feb 2015 19:49:12 +0300 Subject: [PATCH] move cuda tests from core to cudaarithm --- modules/core/test/test_main.cpp | 10 ---------- .../test/cuda => cudaarithm/test}/test_buffer_pool.cpp | 2 +- .../test/cuda => cudaarithm/test}/test_gpumat.cpp | 2 +- .../test/cuda => cudaarithm/test}/test_opengl.cpp | 2 +- .../test/cuda => cudaarithm/test}/test_stream.cpp | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) rename modules/{core/test/cuda => cudaarithm/test}/test_buffer_pool.cpp (99%) rename modules/{core/test/cuda => cudaarithm/test}/test_gpumat.cpp (99%) rename modules/{core/test/cuda => cudaarithm/test}/test_opengl.cpp (99%) rename modules/{core/test/cuda => cudaarithm/test}/test_stream.cpp (99%) diff --git a/modules/core/test/test_main.cpp b/modules/core/test/test_main.cpp index 5ddfb72348..d5400e20fd 100644 --- a/modules/core/test/test_main.cpp +++ b/modules/core/test/test_main.cpp @@ -7,14 +7,4 @@ #include "test_precomp.hpp" -#ifndef HAVE_CUDA - CV_TEST_MAIN("cv") - -#else - -#include "opencv2/ts/cuda_test.hpp" - -CV_CUDA_TEST_MAIN("cv") - -#endif diff --git a/modules/core/test/cuda/test_buffer_pool.cpp b/modules/cudaarithm/test/test_buffer_pool.cpp similarity index 99% rename from modules/core/test/cuda/test_buffer_pool.cpp rename to modules/cudaarithm/test/test_buffer_pool.cpp index eec6ed3f64..becbdd2761 100644 --- a/modules/core/test/cuda/test_buffer_pool.cpp +++ b/modules/cudaarithm/test/test_buffer_pool.cpp @@ -40,7 +40,7 @@ // //M*/ -#include "../test_precomp.hpp" +#include "test_precomp.hpp" #ifdef HAVE_CUDA diff --git a/modules/core/test/cuda/test_gpumat.cpp b/modules/cudaarithm/test/test_gpumat.cpp similarity index 99% rename from modules/core/test/cuda/test_gpumat.cpp rename to modules/cudaarithm/test/test_gpumat.cpp index b549f03a05..3f63352b86 100644 --- a/modules/core/test/cuda/test_gpumat.cpp +++ b/modules/cudaarithm/test/test_gpumat.cpp @@ -40,7 +40,7 @@ // //M*/ -#include "../test_precomp.hpp" +#include "test_precomp.hpp" #ifdef HAVE_CUDA diff --git a/modules/core/test/cuda/test_opengl.cpp b/modules/cudaarithm/test/test_opengl.cpp similarity index 99% rename from modules/core/test/cuda/test_opengl.cpp rename to modules/cudaarithm/test/test_opengl.cpp index f4c733d064..f300dff6bc 100644 --- a/modules/core/test/cuda/test_opengl.cpp +++ b/modules/cudaarithm/test/test_opengl.cpp @@ -40,7 +40,7 @@ // //M*/ -#include "../test_precomp.hpp" +#include "test_precomp.hpp" #if defined(HAVE_CUDA) && defined(HAVE_OPENGL) diff --git a/modules/core/test/cuda/test_stream.cpp b/modules/cudaarithm/test/test_stream.cpp similarity index 99% rename from modules/core/test/cuda/test_stream.cpp rename to modules/cudaarithm/test/test_stream.cpp index a0e451a62a..c9a5e694f2 100644 --- a/modules/core/test/cuda/test_stream.cpp +++ b/modules/cudaarithm/test/test_stream.cpp @@ -40,7 +40,7 @@ // //M*/ -#include "../test_precomp.hpp" +#include "test_precomp.hpp" #ifdef HAVE_CUDA