From ad76ffd544eaba078d66e6bfdcd9db3590438a6c Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Tue, 26 Nov 2019 18:54:22 -0500 Subject: [PATCH] kfdtest: Declare SetUpTestCase() to be public SetUpTestCase() and TearDownTestCase() are declared as protected, preventing us from using TEST_P(). Change-Id: I1d049a475a1b3bd44b5f96305a48751b90d572ce Signed-off-by: Yong Zhao --- tests/kfdtest/src/KFDBaseComponentTest.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/kfdtest/src/KFDBaseComponentTest.hpp b/tests/kfdtest/src/KFDBaseComponentTest.hpp index 8a99e405e4..5fc61015e4 100644 --- a/tests/kfdtest/src/KFDBaseComponentTest.hpp +++ b/tests/kfdtest/src/KFDBaseComponentTest.hpp @@ -58,6 +58,11 @@ class KFDBaseComponentTest : public testing::Test { unsigned int GetFamilyIdFromNodeId(unsigned int nodeId); unsigned int GetFamilyIdFromDefaultNode(){ return m_FamilyId; } + // @brief Executed before the first test that uses KFDBaseComponentTest. + static void SetUpTestCase(); + // @brief Executed after the last test from KFDBaseComponentTest. + static void TearDownTestCase(); + protected: HsaVersionInfo m_VersionInfo; HsaSystemProperties m_SystemProperties; @@ -69,13 +74,9 @@ class KFDBaseComponentTest : public testing::Test { HsaMemFlags m_MemoryFlags; HsaNodeInfo m_NodeInfo; - // @brief Executed before the first test that uses KFDOpenCloseKFDTest class and opens KFD. - static void SetUpTestCase(); - // @brief Executed after the last test from KFDOpenCloseKFDTest class and closes KFD. - static void TearDownTestCase(); - // @brief Executed before every test that uses KFDOpenCloseKFDTest class and sets all common settings for the tests. + // @brief Executed before every test that uses KFDBaseComponentTest class and sets all common settings for the tests. virtual void SetUp(); - // @brief Executed after every test that uses KFDOpenCloseKFDTest class. + // @brief Executed after every test that uses KFDBaseComponentTest class. virtual void TearDown(); };