mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: fix test crash (exception in destructor)

Browse Source
This commit is contained in:
Alexander Alekhin 2016-09-21 17:50:42 +03:00
parent cde9d640fe
commit f50f34016e
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/core/test/test_umat.cpp
View File

@ -1304,20 +1304,18 @@ TEST(UMat, testTempObjects_UMat)
ASSERT_EQ(0, countNonZero(uDiff)); ASSERT_EQ(0, countNonZero(uDiff));
} }
// Disabled due to failure in VS 2015:
// C++11 is enabled by default ==>
// destructors have implicit 'noexcept(true)' specifier ==>
// throwing exception from destructor is not handled correctly
#if defined(_MSC_VER) && _MSC_VER >= 1900 /* MSVC 14 */
TEST(UMat, DISABLED_testTempObjects_Mat)
#else
TEST(UMat, testTempObjects_Mat) TEST(UMat, testTempObjects_Mat)
#endif
{ {
Mat m(10, 10, CV_8UC1, Scalar(1)); Mat m(10, 10, CV_8UC1, Scalar(1));
{ {
Mat m2; Mat m2;
ASSERT_ANY_THROW(m2 = m.getUMat(ACCESS_RW).getMat(ACCESS_RW)); ASSERT_ANY_THROW({
// Below is unwrapped version of this invalid expression:
// m2 = m.getUMat(ACCESS_RW).getMat(ACCESS_RW)
UMat u = m.getUMat(ACCESS_RW);
m2 = u.getMat(ACCESS_RW);
u.release();
});
} }
} }