third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ts: apply CV_OVERRIDE/CV_FINAL

Browse Source 
- disable "-Wsuggest-override" in tests
This commit is contained in:
Alexander Alekhin 2018-03-15 16:04:20 +03:00
parent 6bd80ba71b
commit 773877cd12
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/ts/include/opencv2/ts.hpp
View File

@ -63,7 +63,14 @@
# endif # endif
#endif #endif
#if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
//#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#include "opencv2/ts/ts_gtest.h" #include "opencv2/ts/ts_gtest.h"
#if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
//#pragma GCC diagnostic pop
#endif
#include "opencv2/ts/ts_ext.hpp" #include "opencv2/ts/ts_ext.hpp"
#ifndef GTEST_USES_SIMPLE_RE #ifndef GTEST_USES_SIMPLE_RE
@ -519,13 +526,13 @@ public:
ArrayTest(); ArrayTest();
virtual ~ArrayTest(); virtual ~ArrayTest();
virtual void clear(); virtual void clear() CV_OVERRIDE;
protected: protected:
virtual int read_params( CvFileStorage* fs ); virtual int read_params( CvFileStorage* fs ) CV_OVERRIDE;
virtual int prepare_test_case( int test_case_idx ); virtual int prepare_test_case( int test_case_idx ) CV_OVERRIDE;
virtual int validate_test_results( int test_case_idx ); virtual int validate_test_results( int test_case_idx ) CV_OVERRIDE;
virtual void prepare_to_validation( int test_case_idx ); virtual void prepare_to_validation( int test_case_idx );
virtual void get_test_array_types_and_sizes( int test_case_idx, vector<vector<Size> >& sizes, vector<vector<int> >& types ); virtual void get_test_array_types_and_sizes( int test_case_idx, vector<vector<Size> >& sizes, vector<vector<int> >& types );
@ -558,7 +565,7 @@ public:
protected: protected:
virtual int run_test_case( int expected_code, const string& descr ); virtual int run_test_case( int expected_code, const string& descr );
virtual void run_func(void) = 0; virtual void run_func(void) CV_OVERRIDE = 0;
int test_case_idx; int test_case_idx;
template<class F> template<class F>

6
modules/ts/include/opencv2/ts/ts_ext.hpp
View File

@ -48,7 +48,7 @@ extern int testThreads;
public:\ public:\
GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\ GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
private:\ private:\
virtual void TestBody();\ virtual void TestBody() CV_OVERRIDE;\
virtual void Body();\ virtual void Body();\
static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\ static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
GTEST_DISALLOW_COPY_AND_ASSIGN_(\ GTEST_DISALLOW_COPY_AND_ASSIGN_(\
@ -74,7 +74,7 @@ extern int testThreads;
public:\ public:\
GTEST_TEST_CLASS_NAME_(test_fixture, test_name)() {}\ GTEST_TEST_CLASS_NAME_(test_fixture, test_name)() {}\
private:\ private:\
virtual void TestBody();\ virtual void TestBody() CV_OVERRIDE;\
virtual void Body(); \ virtual void Body(); \
static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\ static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
GTEST_DISALLOW_COPY_AND_ASSIGN_(\ GTEST_DISALLOW_COPY_AND_ASSIGN_(\
@ -102,7 +102,7 @@ extern int testThreads;
GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
private: \ private: \
virtual void bodyMethodName(); \ virtual void bodyMethodName(); \
virtual void TestBody(); \ virtual void TestBody() CV_OVERRIDE; \
static int AddToRegistry() { \ static int AddToRegistry() { \
::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
GetTestCasePatternHolder<test_case_name>(\ GetTestCasePatternHolder<test_case_name>(\

5
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -3,7 +3,6 @@
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "ts_gtest.h"
#include "ts_ext.hpp" #include "ts_ext.hpp"
#include <functional> #include <functional>
@ -397,8 +396,8 @@ public:
protected: protected:
virtual void PerfTestBody() = 0; virtual void PerfTestBody() = 0;
virtual void SetUp(); virtual void SetUp() CV_OVERRIDE;
virtual void TearDown(); virtual void TearDown() CV_OVERRIDE;
bool startTimer(); // bool is dummy for conditional loop bool startTimer(); // bool is dummy for conditional loop
void stopTimer(); void stopTimer();

3
modules/ts/src/ts_gtest.cpp
View File

@ -41,6 +41,9 @@
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wmissing-declarations" # pragma GCC diagnostic ignored "-Wmissing-declarations"
# pragma GCC diagnostic ignored "-Wmissing-field-initializers" # pragma GCC diagnostic ignored "-Wmissing-field-initializers"
# if __GNUC__ >= 5
# pragma GCC diagnostic ignored "-Wsuggest-override"
# endif
#endif #endif
// The following lines pull in the real gtest *.cc files. // The following lines pull in the real gtest *.cc files.