From 97eaa95a1e1dca0fea4a9af34219781c19857dee Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 17 Feb 2011 11:18:32 +0000 Subject: [PATCH] removed check_and_treat_gpu_exception function --- modules/gpu/test/test_main.cpp | 5 ++--- modules/gpu/test/test_precomp.hpp | 23 ----------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/modules/gpu/test/test_main.cpp b/modules/gpu/test/test_main.cpp index 1f2c265c8..d9d535109 100644 --- a/modules/gpu/test/test_main.cpp +++ b/modules/gpu/test/test_main.cpp @@ -1,9 +1,8 @@ #include "test_precomp.hpp" +CV_TEST_MAIN("gpu") + // Run test with --gtest_catch_exceptions flag to avoid runtime errors in // the case when there is no GPU -CV_TEST_MAIN("gpu") // TODO Add other tests from tests/gpu folder -// TODO When there is no GPU test system doesn't print error message: it fails or keeps -// quiet when --gtest_catch_exceptions is enabled diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp index 228fdb84d..aac57335a 100644 --- a/modules/gpu/test/test_precomp.hpp +++ b/modules/gpu/test/test_precomp.hpp @@ -5,27 +5,4 @@ #include "opencv2/gpu/gpu.hpp" #include "opencv2/highgui/highgui.hpp" -static inline bool check_and_treat_gpu_exception(const cv::Exception& e, cvtest::TS* ts) -{ - switch (e.code) - { - case CV_GpuNotSupported: - ts->printf(cvtest::TS::LOG, "\nGpu not supported by the library"); - break; - - case CV_GpuApiCallError: - ts->printf(cvtest::TS::LOG, "\nGPU Error: %s", e.what()); - break; - - case CV_GpuNppCallError: - ts->printf(cvtest::TS::LOG, "\nNPP Error: %s", e.what()); - break; - - default: - return false; - } - ts->set_failed_test_info(cvtest::TS::FAIL_GENERIC); - return true; -} - #endif