Uses different pass count for different parallel queue test cases

[libcds.git] / test / stress / queue / random.cpp

diff --git a/test/stress/queue/random.cpp b/test/stress/queue/random.cpp
index ea30b8ebbe3db88c18a989de2070840fdd0c8996..5a4188a60e8b7ed10131dc3326fdf7491356c3a5 100644 (file)
--- a/test/stress/queue/random.cpp
+++ b/test/stress/queue/random.cpp
@@ -237,16 +237,12 @@ namespace {
     CDSSTRESS_MoirQueue( queue_random )
     CDSSTRESS_BasketQueue( queue_random )
     CDSSTRESS_OptimsticQueue( queue_random )
-    CDSSTRESS_FCQueue( queue_random )
-    CDSSTRESS_FCDeque( queue_random )
     CDSSTRESS_RWQueue( queue_random )
-    CDSSTRESS_StdQueue( queue_random )
 
 #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 ) \
     { \
-        if ( !check_detail_level( level )) return; \
         typedef queue::Types< value_type >::type_name queue_type; \
         queue_type queue( s_nQueueSize ); \
         test( queue ); \
@@ -315,17 +311,27 @@ namespace {
         }
     };
 
-#define CDSSTRESS_Queue_F( test_fixture, type_name, level ) \
+#define CDSSTRESS_Queue_F( 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_random )
 
+#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_random,
+        ::testing::ValuesIn( segmented_queue_random::get_test_parameters()), get_test_parameter_name );
+#else
     INSTANTIATE_TEST_CASE_P( SQ,
         segmented_queue_random,
         ::testing::ValuesIn( segmented_queue_random::get_test_parameters()));
+#endif
+
 } // namespace