From ae79fe10dc72f65f0ede1cda947db57ad7032a98 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 19 May 2015 17:28:43 +0300 Subject: [PATCH] do not loose logs from nvidia tests (cherry picked from commit d58d277707ac4750d0986c25de1ef6ca896254aa) --- modules/gpu/test/nvidia/main_nvidia.cpp | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp index 32f83d3..897ecec 100644 --- a/modules/gpu/test/nvidia/main_nvidia.cpp +++ b/modules/gpu/test/nvidia/main_nvidia.cpp @@ -340,7 +340,8 @@ bool nvidia_NPPST_Integral_Image(const std::string& test_data_path, OutputLevel bool nvidia_NPPST_Squared_Integral_Image(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerSII("NPPST Squared Integral Image", outputLevel); @@ -354,7 +355,8 @@ bool nvidia_NPPST_Squared_Integral_Image(const std::string& test_data_path, Outp bool nvidia_NPPST_RectStdDev(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerRStdDev("NPPST RectStdDev", outputLevel); @@ -368,7 +370,8 @@ bool nvidia_NPPST_RectStdDev(const std::string& test_data_path, OutputLevel outp bool nvidia_NPPST_Resize(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerResize("NPPST Resize", outputLevel); @@ -384,7 +387,8 @@ bool nvidia_NPPST_Resize(const std::string& test_data_path, OutputLevel outputLe bool nvidia_NPPST_Vector_Operations(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerNPPSTVectorOperations("NPPST Vector Operations", outputLevel); @@ -398,7 +402,8 @@ bool nvidia_NPPST_Vector_Operations(const std::string& test_data_path, OutputLev bool nvidia_NPPST_Transpose(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerTranspose("NPPST Transpose", outputLevel); @@ -414,7 +419,8 @@ bool nvidia_NPPST_Transpose(const std::string& test_data_path, OutputLevel outpu bool nvidia_NCV_Vector_Operations(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerVectorOperations("Vector Operations", outputLevel); @@ -429,7 +435,8 @@ bool nvidia_NCV_Vector_Operations(const std::string& test_data_path, OutputLevel bool nvidia_NCV_Haar_Cascade_Loader(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerHaarLoader("Haar Cascade Loader", outputLevel); @@ -441,7 +448,8 @@ bool nvidia_NCV_Haar_Cascade_Loader(const std::string& test_data_path, OutputLev bool nvidia_NCV_Haar_Cascade_Application(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerHaarAppl("Haar Cascade Application", outputLevel); @@ -455,7 +463,8 @@ bool nvidia_NCV_Haar_Cascade_Application(const std::string& test_data_path, Outp bool nvidia_NCV_Hypotheses_Filtration(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerHypFiltration("Hypotheses Filtration", outputLevel); @@ -469,7 +478,8 @@ bool nvidia_NCV_Hypotheses_Filtration(const std::string& test_data_path, OutputL bool nvidia_NCV_Visualization(const std::string& test_data_path, OutputLevel outputLevel) { path = test_data_path; - ncvSetDebugOutputHandler(devNullOutput); + if (outputLevel != OutputLevelFull) + ncvSetDebugOutputHandler(devNullOutput); NCVAutoTestLister testListerVisualize("Visualization", outputLevel); -- 2.7.4