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

diff --git a/haltests/tc_tbm.h b/haltests/tc_tbm.h
index 65196c5333d14661435193be78a8ad836e2975fc..7c67daa8ad8a2cb0864764f6e32064dfb1d91950 100644 (file)
--- 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<bool, bool, const char*> >
+class TBMEnv : public Test
 {
 public:
        void SetUp(void);

diff --git a/haltests/tc_tbm_bo.cpp b/haltests/tc_tbm_bo.cpp
index b539863d1fe711f6b3fbea48c677fb9a1f56a165..f63c8c1109fc34ea0503423d2cfda2b725fea54a 100644 (file)
--- 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 9357b690c843d9eeee621e5e1411fb3e03eb238d..2faf9e33a39af0ea1a1e66435935db03343d32ca 100644 (file)
--- 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 c2325bcb1673c24b3de729807b554ebf075724bf..48ebceb6fc62c845752e3684139bc287c83a821b 100644 (file)
--- 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