From d10ec9944cb235e5cf8e6a94bd875b184318e2cc Mon Sep 17 00:00:00 2001 From: Maciej Dziuban Date: Mon, 27 May 2019 10:00:57 +0200 Subject: [PATCH] Check support for SetUp and TearDown in HWCMDTEST_P Change-Id: I597e6d68daaf790d63d1e3948b8c66831a483cc4 Signed-off-by: Maciej Dziuban --- unit_tests/gen_common/test.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/unit_tests/gen_common/test.h b/unit_tests/gen_common/test.h index d78e0d5230..3fe9475a34 100644 --- a/unit_tests/gen_common/test.h +++ b/unit_tests/gen_common/test.h @@ -88,7 +88,7 @@ extern GFXCORE_FAMILY renderCoreFamily; public: \ GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ () {} \ - virtual void TestBody(); \ + virtual void TestBody() override; \ \ private: \ static int AddToRegistry() { \ @@ -409,7 +409,7 @@ extern GFXCORE_FAMILY renderCoreFamily; template \ void testBodyHw(); \ \ - virtual void TestBody() { \ + virtual void TestBody() override { \ switch (::renderCoreFamily) { \ case IGFX_GEN8_CORE: \ BDW_TYPED_TEST_BODY \ @@ -469,7 +469,7 @@ extern GFXCORE_FAMILY renderCoreFamily; /* do nothing */ \ } \ \ - virtual void TestBody() { \ + virtual void TestBody() override { \ switch (::renderCoreFamily) { \ case IGFX_GEN8_CORE: \ BDW_TYPED_CMDTEST_BODY \ @@ -487,6 +487,12 @@ extern GFXCORE_FAMILY renderCoreFamily; ASSERT_TRUE((false && "Unknown hardware family")); \ break; \ } \ + } \ + void SetUp() override { \ + CALL_IF_SUPPORTED(cmdset_gen_base, test_suite_name::SetUp()); \ + } \ + void TearDown() override { \ + CALL_IF_SUPPORTED(cmdset_gen_base, test_suite_name::TearDown()); \ } \ \ private: \