Fix test macros

HWTEST2_F and HWTEST2_P

Change-Id: Iccd811b835551219597526d59c1ddfcdf350ab4a
Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
This commit is contained in:
Katarzyna Cencelewska
2020-05-25 14:17:46 +02:00
committed by sys_ocldev
parent 3656ce868a
commit 3c102fa54d

View File

@@ -234,16 +234,8 @@ extern GFXCORE_FAMILY renderCoreFamily;
template <unsigned int matcherOrdinal> \
bool checkMatch(PRODUCT_FAMILY matchProduct); \
\
void SetUp() override { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
parent_class::SetUp(); \
} \
} \
void TearDown() override { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
parent_class::TearDown(); \
} \
} \
void SetUp() override; \
void TearDown() override; \
void TestBody() override; \
\
static ::testing::TestInfo *const test_info_ GTEST_ATTRIBUTE_UNUSED_; \
@@ -318,6 +310,17 @@ extern GFXCORE_FAMILY renderCoreFamily;
} \
} \
\
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::SetUp() { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
parent_class::SetUp(); \
} \
} \
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TearDown() { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
parent_class::TearDown(); \
} \
} \
\
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() { \
checkForMatch<SupportedProductFamilies::size - 1u>(::productFamily); \
} \
@@ -643,16 +646,8 @@ extern GFXCORE_FAMILY renderCoreFamily;
template <unsigned int matcherOrdinal> \
bool checkMatch(PRODUCT_FAMILY matchProduct); \
\
void SetUp() override { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
test_suite_name::SetUp(); \
} \
} \
void TearDown() override { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
test_suite_name::TearDown(); \
} \
} \
void SetUp() override; \
void TearDown() override; \
\
void TestBody() override; \
\
@@ -729,6 +724,17 @@ extern GFXCORE_FAMILY renderCoreFamily;
} \
} \
\
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::SetUp() { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
test_suite_name::SetUp(); \
} \
} \
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TearDown() { \
if (checkMatch<SupportedProductFamilies::size - 1u>(::productFamily)) { \
test_suite_name::TearDown(); \
} \
} \
\
void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody() { \
checkForMatch<SupportedProductFamilies::size - 1u>(::productFamily); \
} \