Skip to content

G-API: Fixed valgrind warnings in accessors tests#19802

Merged
opencv-pushbot merged 1 commit intoopencv:masterfrom
rgarnov:rg/fix_accessor_tests_valgrind_warnings
Mar 29, 2021
Merged

G-API: Fixed valgrind warnings in accessors tests#19802
opencv-pushbot merged 1 commit intoopencv:masterfrom
rgarnov:rg/fix_accessor_tests_valgrind_warnings

Conversation

@rgarnov
Copy link
Copy Markdown
Contributor

@rgarnov rgarnov commented Mar 29, 2021 •
edited by alalek
Loading

Summary

Fixes #19800

  • Moved std::functions from test parameters to function tables as valgrind complains on google tests trying to print std::functions

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom,Custom Win,Custom Mac
build_gapi_standalone:Linux x64=ade-0.1.1f
build_gapi_standalone:Win64=ade-0.1.1f
build_gapi_standalone:Mac=ade-0.1.1f
build_gapi_standalone:Linux x64 Debug=ade-0.1.1f

Xbuild_image:Custom=centos:7
Xbuildworker:Custom=linux-1
Xbuild_gapi_standalone:Custom=ade-0.1.1f

build_image:Custom=ubuntu-openvino-2021.1.0:20.04
build_image:Custom Win=openvino-2021.3.0
build_image:Custom Mac=openvino-2021.3.0

test_modules:Custom=gapi
test_modules:Custom Win=gapi
test_modules:Custom Mac=gapi

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

@rgarnov rgarnov force-pushed the rg/fix_accessor_tests_valgrind_warnings branch from 7f2be27 to b5339cc Compare March 29, 2021 14:44
TolyaTalamanov
TolyaTalamanov approved these changes Mar 29, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@TolyaTalamanov TolyaTalamanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

modules/gapi/test/streaming/gapi_streaming_tests.cpp
switch (a) {
case TestSourceType::BGR: return os << "BGR";
case TestSourceType::NV12: return os << "NV12";
default: CV_Assert(false && "unknown TestSourceType");
Copy link
Copy Markdown
Contributor

@TolyaTalamanov TolyaTalamanov Mar 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should work, but does it make sense to use GAPI_Assert

Copy link
Copy Markdown
Contributor Author

@rgarnov rgarnov Mar 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can recall that there was an agreement to use CV_Assert in tests not to depend on GAPI_Assert implementation, but I might be mistaken. Grep says that there are both CV_ and GAPI_ in our tests, need to align that one day

@TolyaTalamanov
Copy link
Copy Markdown
Contributor

TolyaTalamanov commented Mar 29, 2021

@alalek I believe it can be merged

@opencv-pushbot opencv-pushbot merged commit 105b57c into opencv:master Mar 29, 2021
AsyaPronina
AsyaPronina reviewed Mar 29, 2021
View reviewed changes
modules/gapi/test/streaming/gapi_streaming_tests.cpp
)
);
Values(TestSourceType::NV12),
Values(TestAccessType::Y)
Copy link
Copy Markdown
Contributor

@AsyaPronina AsyaPronina Mar 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not BGR?

@alalek alalek mentioned this pull request Apr 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AsyaPronina AsyaPronina AsyaPronina left review comments

@TolyaTalamanov TolyaTalamanov TolyaTalamanov approved these changes

Assignees

@TolyaTalamanov TolyaTalamanov

Labels

category: g-api / gapi test

Projects

None yet

Milestone

4.5.2

Development

Successfully merging this pull request may close these issues.

G-API: valgrind issues (2021-03-28)

5 participants

@rgarnov @TolyaTalamanov @AsyaPronina @opencv-pushbot @alalek