From c34885fcd6f8636c0c3fe1ce9e613d74a5d59ed9 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 15 Apr 2022 16:09:05 +0900 Subject: [PATCH] test: donot use parametized tests for fix the testing error message from Gtest module. There are no TEST_P cases in tbm-haltests yet. Therefore TBMEnv don't need to inherit the parametized class of Gtest. Change-Id: I245efc1206a39dd562ae5781be2cf7011f286a0b --- haltests/tc_tbm.h | 3 ++- haltests/tc_tbm_bo.cpp | 2 ++ haltests/tc_tbm_bufmgr.cpp | 3 ++- haltests/tc_tbm_env.cpp | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/haltests/tc_tbm.h b/haltests/tc_tbm.h index 65196c5..7c67daa 100644 --- a/haltests/tc_tbm.h +++ b/haltests/tc_tbm.h @@ -102,12 +102,13 @@ #define TBM_UT_BO_SIZE 1024 #define TBM_UT_SURFACE_QUEUE_SIZE 4 +using ::testing::Test; using ::testing::TestWithParam; using ::testing::Bool; using ::testing::Values; using ::testing::Combine; -class TBMEnv : public TestWithParam< std::tuple > +class TBMEnv : public Test { public: void SetUp(void); diff --git a/haltests/tc_tbm_bo.cpp b/haltests/tc_tbm_bo.cpp index b539863..f63c8c1 100644 --- a/haltests/tc_tbm_bo.cpp +++ b/haltests/tc_tbm_bo.cpp @@ -1212,6 +1212,8 @@ TEST_F(TBMBo, BoGetFlagsWithBoParamTest) EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_INVALID_PARAMETER)); } +#if 0 INSTANTIATE_TEST_CASE_P(TBMBoParams, TBMBo, Combine(Bool(), Bool(), Values("none"))); +#endif diff --git a/haltests/tc_tbm_bufmgr.cpp b/haltests/tc_tbm_bufmgr.cpp index 9357b69..2faf9e3 100644 --- a/haltests/tc_tbm_bufmgr.cpp +++ b/haltests/tc_tbm_bufmgr.cpp @@ -154,7 +154,8 @@ TEST_F(TBMBufmgr, BufmgrSetBoLockTypeWithBufmgrParamTest) /* tbm_bufmgr_debug_dump_set_scale() */ /* tbm_bufmgr_debug_get_ref_count */ +#if 0 INSTANTIATE_TEST_CASE_P(TBMBufmgrParams, TBMBufmgr, Combine(Bool(), Bool(), Values("none"))); - +#endif diff --git a/haltests/tc_tbm_env.cpp b/haltests/tc_tbm_env.cpp index c2325bc..48ebceb 100644 --- a/haltests/tc_tbm_env.cpp +++ b/haltests/tc_tbm_env.cpp @@ -209,6 +209,8 @@ TEST_F(TBMEnv, SurfaceQueryFormatSuccess) free(formats); } +#if 0 INSTANTIATE_TEST_CASE_P(TBMEnvParams, TBMEnv, Combine(Bool(), Bool(), Values("none"))); +#endif -- 2.34.1