From 55339de684431698d4c0c7ff9c0a2de5d13eee1b Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 13 Apr 2015 17:11:19 +0300 Subject: [PATCH] make NVIDIA tests verbose by default (cherry picked from commit 17608f7ade9f31f2363bcf1d15153b75868b8f15) --- modules/gpu/test/main.cpp | 2 +- modules/gpu/test/nvidia/main_nvidia.cpp | 3 ++- modules/gpu/test/test_nvidia.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/gpu/test/main.cpp b/modules/gpu/test/main.cpp index 01a2961..f9549fb 100644 --- a/modules/gpu/test/main.cpp +++ b/modules/gpu/test/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char** argv) "{ h | help ? | false | Print help}" "{ i | info | false | Print information about system and exit }" "{ d | device | -1 | Device on which tests will be executed (-1 means all devices) }" - "{ nvtest_output_level | nvtest_output_level | none | NVidia test verbosity level (none, compact, full) }" + "{ nvtest_output_level | nvtest_output_level | full | NVidia test verbosity level (none, compact, full) }" ; CommandLineParser cmd(argc, (const char**)argv, keys); diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp index 0708315..32f83d3 100644 --- a/modules/gpu/test/nvidia/main_nvidia.cpp +++ b/modules/gpu/test/nvidia/main_nvidia.cpp @@ -323,7 +323,8 @@ static void devNullOutput(const std::string& msg) bool nvidia_NPPST_Integral_Image(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path.c_str(); - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerII("NPPST Integral Image", outputLevel); diff --git a/modules/gpu/test/test_nvidia.cpp b/modules/gpu/test/test_nvidia.cpp index d713b41..e065356 100644 --- a/modules/gpu/test/test_nvidia.cpp +++ b/modules/gpu/test/test_nvidia.cpp @@ -44,7 +44,7 @@ #ifdef HAVE_CUDA -OutputLevel nvidiaTestOutputLevel = OutputLevelNone; +OutputLevel nvidiaTestOutputLevel = OutputLevelFull; using namespace cvtest; using namespace testing; -- 2.7.4