From 31e0d90da699344a1f3a1ce2ff4ad585a9ab4e6b Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Thu, 22 Oct 2015 12:44:03 +0300 Subject: [PATCH] Enable temp objects destruction test for VS versions less than 2015 --- modules/core/test/test_umat.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/core/test/test_umat.cpp b/modules/core/test/test_umat.cpp index fe64d2f94..6afd432cf 100644 --- a/modules/core/test/test_umat.cpp +++ b/modules/core/test/test_umat.cpp @@ -1302,7 +1302,11 @@ TEST(UMat, testTempObjects_UMat) // 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) +#endif { Mat m(10, 10, CV_8UC1, Scalar(1)); {