Merge d289a0b into 32f9a27

srz-zumix · Sep 27, 2020 · 1870dfc · 1870dfc
2 parents 32f9a27 + d289a0b
commit 1870dfc
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 53 deletions.
diff --git a/test/environment_tests.cpp b/test/environment_tests.cpp
@@ -33,14 +33,14 @@ class MyEnvironment : public ::iutest::Environment
     }
 
 private:
-    virtual void SetUp(void)
+    virtual void SetUp(void) IUTEST_CXX_OVERRIDE
     {
         setup = true;
         ++test_counter;
         Environment::SetUp();
     }
 
-    virtual void TearDown(void)
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE
     {
         teardown = true;
         --test_counter;
@@ -51,13 +51,13 @@ class MyEnvironment : public ::iutest::Environment
 class MyEnvironment2 : public ::iutest::Environment
 {
 private:
-    virtual void SetUp(void)
+    virtual void SetUp(void) IUTEST_CXX_OVERRIDE
     {
         IUTEST_ASSERT_EQ(1, test_counter);
         ++test_counter;
     }
 
-    virtual void TearDown(void)
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE
     {
         IUTEST_ASSERT_EQ(2, test_counter);
         --test_counter;

diff --git a/test/file_system_tests.cpp b/test/file_system_tests.cpp
@@ -31,12 +31,12 @@ void FileSystemCallTest()
 class TestFileSystem : public ::iutest::detail::IFileSystem
 {
 private:
-    virtual ::iutest::IFile* Create(void)
+    virtual ::iutest::IFile* Create(void) IUTEST_CXX_OVERRIDE
     {
         is_call_create = true;
         return NULL;
     }
-    virtual void Delete(::iutest::IFile*)
+    virtual void Delete(::iutest::IFile*) IUTEST_CXX_OVERRIDE
     {
         is_call_delete = true;
     }

diff --git a/test/fixture_tests.cpp b/test/fixture_tests.cpp
@@ -22,7 +22,7 @@ class TestSetUpEachCall : public ::iuutil::backward::Test<TestSetUpEachCall>
 protected:
     static int x;
 public:
-    virtual void SetUp(void)
+    virtual void SetUp(void) IUTEST_CXX_OVERRIDE
     {
         ++x;
     }
@@ -53,12 +53,12 @@ class TestFixture : public ::iuutil::backward::Test<TestFixture>
         IUTEST_ASSERT_EQ(-1, x);
         x = 0;
     }
-    virtual void SetUp(void)
+    virtual void SetUp(void) IUTEST_CXX_OVERRIDE
     {
         IUTEST_ASSERT_EQ(0, x);
         ++x;
     }
-    virtual void TearDown(void)
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE
     {
         IUTEST_ASSERT_EQ(2, x);
         ++x;

diff --git a/test/legacy_testcase_api_tests.cpp b/test/legacy_testcase_api_tests.cpp
@@ -133,56 +133,56 @@ class MyTestEventListener : public ::iutest::TestEventListener
     {}
 
 public:
-    virtual void OnTestProgramStart(const ::iutest::UnitTest& /*test*/)
+    virtual void OnTestProgramStart(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
     }
     virtual void OnTestIterationStart(const ::iutest::UnitTest& /*test*/
-                                    , int /*iteration*/)
+                                    , int /*iteration*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnEnvironmentsSetUpStart(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsSetUpStart(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnEnvironmentsSetUpEnd(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsSetUpEnd(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnTestCaseStart(const ::iutest::TestCase& test_case)
+    virtual void OnTestCaseStart(const ::iutest::TestCase& test_case) IUTEST_CXX_OVERRIDE
     {
         if( ::iutest::detail::IsStringEqual(test_case.name(), "EventListenerTest") )
         {
             called_OnTestCaseStart = true;
         }
     }
-    virtual void OnTestStart(const ::iutest::TestInfo& /*test_info*/)
+    virtual void OnTestStart(const ::iutest::TestInfo& /*test_info*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnTestPartResult(const ::iutest::TestPartResult& /*test_part_result*/)
+    virtual void OnTestPartResult(const ::iutest::TestPartResult& /*test_part_result*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnTestRecordProperty(const ::iutest::TestProperty& /*test_property*/)
+    virtual void OnTestRecordProperty(const ::iutest::TestProperty& /*test_property*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnTestEnd(const ::iutest::TestInfo& /*test_info*/)
+    virtual void OnTestEnd(const ::iutest::TestInfo& /*test_info*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnTestCaseEnd(const ::iutest::TestCase& test_case)
+    virtual void OnTestCaseEnd(const ::iutest::TestCase& test_case) IUTEST_CXX_OVERRIDE
     {
         if( ::iutest::detail::IsStringEqual(test_case.name(), "EventListenerTest") )
         {
             called_OnTestCaseEnd = true;
         }
     }
-    virtual void OnEnvironmentsTearDownStart(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsTearDownStart(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnEnvironmentsTearDownEnd(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsTearDownEnd(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
     }
     virtual void OnTestIterationEnd(const ::iutest::UnitTest& /*test*/
-                                    , int /*iteration*/)
+                                    , int /*iteration*/) IUTEST_CXX_OVERRIDE
     {
     }
-    virtual void OnTestProgramEnd(const ::iutest::UnitTest& /*test*/)
+    virtual void OnTestProgramEnd(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
     }
 };

diff --git a/test/listener_tests.cpp b/test/listener_tests.cpp
@@ -54,36 +54,36 @@ class MyTestEventListener : public ::iuutil::backward::TestEventListener
     {}
 
 public:
-    virtual void OnTestProgramStart(const ::iutest::UnitTest& /*test*/)
+    virtual void OnTestProgramStart(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestProgramStart = true;
     }
     virtual void OnTestIterationStart(const ::iutest::UnitTest& /*test*/
-                                    , int /*iteration*/)
+                                    , int /*iteration*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestIterationStart = true;
     }
-    virtual void OnEnvironmentsSetUpStart(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsSetUpStart(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
         called_OnEnvironmentsSetUpStart = true;
     }
-    virtual void OnEnvironmentsSetUpEnd(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsSetUpEnd(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
         called_OnEnvironmentsSetUpEnd = true;
     }
-    virtual void OnTestSuiteStart(const ::iutest::TestSuite& /*test_suite*/)
+    virtual void OnTestSuiteStart(const ::iutest::TestSuite& /*test_suite*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestSuiteStart = true;
     }
-    virtual void OnTestStart(const ::iutest::TestInfo& /*test_info*/)
+    virtual void OnTestStart(const ::iutest::TestInfo& /*test_info*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestStart = true;
     }
-    virtual void OnTestPartResult(const ::iutest::TestPartResult& /*test_part_result*/)
+    virtual void OnTestPartResult(const ::iutest::TestPartResult& /*test_part_result*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestPartResult = true;
     }
-    virtual void OnTestRecordProperty(const ::iutest::TestProperty& test_property)
+    virtual void OnTestRecordProperty(const ::iutest::TestProperty& test_property) IUTEST_CXX_OVERRIDE
     {
         called_OnTestRecordProperty = true;
 #if !defined(IUTEST_USE_GTEST)
@@ -92,28 +92,28 @@ class MyTestEventListener : public ::iuutil::backward::TestEventListener
         IUTEST_UNUSED_VAR(test_property);
 #endif
     }
-    virtual void OnTestEnd(const ::iutest::TestInfo& /*test_info*/)
+    virtual void OnTestEnd(const ::iutest::TestInfo& /*test_info*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestEnd = true;
     }
-    virtual void OnTestSuiteEnd(const ::iutest::TestSuite& /*test_suite*/)
+    virtual void OnTestSuiteEnd(const ::iutest::TestSuite& /*test_suite*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestSuiteEnd = true;
     }
-    virtual void OnEnvironmentsTearDownStart(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsTearDownStart(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
         called_OnEnvironmentsTearDownStart = true;
     }
-    virtual void OnEnvironmentsTearDownEnd(const ::iutest::UnitTest& /*test*/)
+    virtual void OnEnvironmentsTearDownEnd(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
         called_OnEnvironmentsTearDownEnd = true;
     }
     virtual void OnTestIterationEnd(const ::iutest::UnitTest& /*test*/
-                                    , int /*iteration*/)
+                                    , int /*iteration*/) IUTEST_CXX_OVERRIDE
     {
         called_OnTestIterationEnd = true;
     }
-    virtual void OnTestProgramEnd(const ::iutest::UnitTest& /*test*/)
+    virtual void OnTestProgramEnd(const ::iutest::UnitTest& /*test*/) IUTEST_CXX_OVERRIDE
     {
         if( called_OnTestProgramEnd ) exit(1);
         called_OnTestProgramEnd = true;

diff --git a/test/output_junit_xml_tests.cpp b/test/output_junit_xml_tests.cpp
@@ -30,7 +30,7 @@ class FileIO : public ::iutest::StringStreamFile
 public:
     static ::std::string s_io;
 
-    virtual void Close()
+    virtual void Close() IUTEST_CXX_OVERRIDE
     {
         s_io = ss.str();
     }

diff --git a/test/output_long_type_param_tests.cpp b/test/output_long_type_param_tests.cpp
@@ -32,7 +32,7 @@ class FileIO : public ::iutest::StringStreamFile
 public:
     static ::std::string s_io;
 
-    virtual void Close()
+    virtual void Close() IUTEST_CXX_OVERRIDE
     {
         s_io = ss.str();
     }

diff --git a/test/output_xml_tests.cpp b/test/output_xml_tests.cpp
@@ -30,7 +30,7 @@ class FileIO : public ::iutest::StringStreamFile
 public:
     static ::std::string s_io;
 
-    virtual void Close()
+    virtual void Close() IUTEST_CXX_OVERRIDE
     {
         s_io = ss.str();
     }

diff --git a/test/random_seed_tests.cpp b/test/random_seed_tests.cpp
@@ -25,8 +25,8 @@ static int random_speed_test_count = 0;
 class MyEnvironment : public ::iutest::Environment
 {
 private:
-    virtual void SetUp(void) {}
-    virtual void TearDown(void) { seed = ::iutest::UnitTest::GetInstance()->random_seed(); ++random_speed_test_count; }
+    virtual void SetUp(void) IUTEST_CXX_OVERRIDE {}
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE { seed = ::iutest::UnitTest::GetInstance()->random_seed(); ++random_speed_test_count; }
 };
 
 IUTEST(Foo, Bar)

diff --git a/test/repeat_tests.cpp b/test/repeat_tests.cpp
@@ -52,8 +52,8 @@ int g_environment_teardown = 0;
 class MyEnvironment : public ::iutest::Environment
 {
 private:
-    virtual void SetUp(void)    { ++g_environment_setup; }
-    virtual void TearDown(void) { ++g_environment_teardown; }
+    virtual void SetUp(void)    IUTEST_CXX_OVERRIDE { ++g_environment_setup; }
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE { ++g_environment_teardown; }
 };
 
 IUTEST(Repeat, Counter)

diff --git a/test/set_up_failure_tests.cpp b/test/set_up_failure_tests.cpp
@@ -23,7 +23,7 @@ static int teardown_flag = 0;
 class TestSetUpFailure : public ::iutest::Test
 {
 public:
-    virtual void SetUp()
+    virtual void SetUp() IUTEST_CXX_OVERRIDE
     {
         IUTEST_FAIL() << "SetUp Failed.";
     }
@@ -37,7 +37,7 @@ IUTEST_F(TestSetUpFailure, Test)
 class TestTearDownFailure : public ::iutest::Test
 {
 public:
-    virtual void TearDown()
+    virtual void TearDown() IUTEST_CXX_OVERRIDE
     {
         IUTEST_FAIL() << "TearDown Failed.";
     }

diff --git a/test/set_up_global_failure_tests.cpp b/test/set_up_global_failure_tests.cpp
@@ -22,7 +22,7 @@ static bool setup_failure=true;
 class SetUpFailureEnvironment : public ::iutest::Environment
 {
 private:
-    virtual void SetUp(void)
+    virtual void SetUp(void) IUTEST_CXX_OVERRIDE
     {
         if( setup_failure )
         {
@@ -34,7 +34,7 @@ class SetUpFailureEnvironment : public ::iutest::Environment
 class TearDownFailureEnvironment : public ::iutest::Environment
 {
 private:
-    virtual void TearDown(void)
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE
     {
         IUTEST_FAIL();
     }

diff --git a/test/shuffle_tests.cpp b/test/shuffle_tests.cpp
@@ -23,8 +23,8 @@ static int shuffle_tests_count = 0;
 class MyEnvironment : public ::iutest::Environment
 {
 private:
-    virtual void SetUp(void)    {}
-    virtual void TearDown(void) { seed = ::iutest::UnitTest::GetInstance()->random_seed(); ++shuffle_tests_count; }
+    virtual void SetUp(void)    IUTEST_CXX_OVERRIDE {}
+    virtual void TearDown(void) IUTEST_CXX_OVERRIDE { seed = ::iutest::UnitTest::GetInstance()->random_seed(); ++shuffle_tests_count; }
 };
 
 IUTEST(Foo, Bar)

diff --git a/test/skip_tests.cpp b/test/skip_tests.cpp
@@ -63,7 +63,7 @@ IUTEST_F(SetUpTestSuiteSkipTest, NotRun)
 class SetUpSkipTest : public ::iutest::Test
 {
 public:
-    virtual void SetUp()
+    virtual void SetUp() IUTEST_CXX_OVERRIDE
     {
         IUTEST_SKIP() << "skip in SetUp";
     }

diff --git a/test/tap_file_generator_listener_tests.cpp b/test/tap_file_generator_listener_tests.cpp
@@ -31,7 +31,7 @@ class FileIO : public ::iutest::StringStreamFile
 public:
     static ::std::string s_io;
 
-    virtual void Close()
+    virtual void Close() IUTEST_CXX_OVERRIDE
     {
         s_io += ss.str();
     }

diff --git a/test/throw_on_failure_tests.cpp b/test/throw_on_failure_tests.cpp
@@ -68,7 +68,7 @@ IUTEST_F(SetUpTestCaseThrow, Test)
 class SetUpThrow : public ::iutest::Test
 {
 public:
-    void SetUp()
+    void SetUp() IUTEST_CXX_OVERRIDE
     {
         throw 2;
     }

diff --git a/utils/clangversion.mk b/utils/clangversion.mk
@@ -151,6 +151,11 @@ ifeq (1,$(shell expr \( $(CLANGMAJOR) \>= 3 \)))
 IUTEST_CXX_STRICT_FLAGS+=-Wunreachable-code
 endif
 
+# 10.0 later
+ifeq (1,$(shell expr \( $(CLANGMAJOR) \> 10 \)))
+IUTEST_CXX_STRICT_FLAGS+=Wsuggest-override
+endif
+
 
 ifeq ($(CLANG_TATGET), x86_64-pc-windows-msvc)
 CXXFLAGS+= -Xclang -flto-visibility-public-std

diff --git a/utils/gccversion.mk b/utils/gccversion.mk
@@ -139,4 +139,9 @@ ifeq (1,$(shell expr \( $(GCCMAJOR) \> 3 \) ))
 IUTEST_CXX_STRICT_FLAGS+=-Wunreachable-code
 endif
 
+# 5.1 later
+ifeq (1,$(shell expr \( $(GCCMAJOR) \> 5 \) \| \( $(GCCMAJOR) = 5 \& $(GCCMINOR) \> 0 \)))
+IUTEST_CXX_STRICT_FLAGS+=-Wsuggest-override
+endif
+
 endif