projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trims down unnecessary queue test casese
[libcds.git]
/
test
/
stress
/
queue
/
push.cpp
diff --git
a/test/stress/queue/push.cpp
b/test/stress/queue/push.cpp
index 222a7efe82e1ff389f6eaf69e9e0f372d6f58252..57bb3697d8a30b441232de19a1eedc91c2244c8d 100644
(file)
--- a/
test/stress/queue/push.cpp
+++ b/
test/stress/queue/push.cpp
@@
-173,16
+173,12
@@
namespace {
CDSSTRESS_MoirQueue( queue_push )
CDSSTRESS_BasketQueue( queue_push )
CDSSTRESS_OptimsticQueue( queue_push )
CDSSTRESS_MoirQueue( queue_push )
CDSSTRESS_BasketQueue( queue_push )
CDSSTRESS_OptimsticQueue( queue_push )
- CDSSTRESS_FCQueue( queue_push )
- CDSSTRESS_FCDeque( queue_push )
CDSSTRESS_RWQueue( queue_push )
CDSSTRESS_RWQueue( queue_push )
- CDSSTRESS_StdQueue( queue_push )
#undef CDSSTRESS_Queue_F
#undef CDSSTRESS_Queue_F
-#define CDSSTRESS_Queue_F( test_fixture, type_name
, level
) \
+#define CDSSTRESS_Queue_F( test_fixture, type_name ) \
TEST_F( test_fixture, type_name ) \
{ \
TEST_F( test_fixture, type_name ) \
{ \
- if ( !check_detail_level( level )) return; \
typedef queue::Types< value_type >::type_name queue_type; \
queue_type queue( s_nQueueSize ); \
test( queue ); \
typedef queue::Types< value_type >::type_name queue_type; \
queue_type queue( s_nQueueSize ); \
test( queue ); \
@@
-236,18
+232,28
@@
namespace {
}
};
}
};
-#define CDSSTRESS_Queue_F( test_fixture, type_name
, level
) \
+#define CDSSTRESS_Queue_F( test_fixture, type_name ) \
TEST_P( test_fixture, type_name ) \
{ \
TEST_P( test_fixture, type_name ) \
{ \
- if ( !check_detail_level( level )) return; \
typedef typename queue::Types<value_type>::type_name queue_type; \
test< queue_type >(); \
}
CDSSTRESS_SegmentedQueue( segmented_queue_push )
typedef typename queue::Types<value_type>::type_name queue_type; \
test< queue_type >(); \
}
CDSSTRESS_SegmentedQueue( segmented_queue_push )
+#ifdef CDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG
+ static std::string get_test_parameter_name( testing::TestParamInfo<size_t> const& p )
+ {
+ return std::to_string( p.param );
+ }
INSTANTIATE_TEST_CASE_P( SQ,
segmented_queue_push,
INSTANTIATE_TEST_CASE_P( SQ,
segmented_queue_push,
- ::testing::ValuesIn( segmented_queue_push::get_test_parameters()));
+ ::testing::ValuesIn( segmented_queue_push::get_test_parameters()), get_test_parameter_name );
+#else
+ INSTANTIATE_TEST_CASE_P( SQ,
+ segmented_queue_push,
+ ::testing::ValuesIn( segmented_queue_push::get_test_parameters()));
+#endif
+
} // namespace
} // namespace