Disables running some stat analysis for benchmarks & Adds some sequential data structures

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

diff --git a/test/stress/queue/pop.cpp b/test/stress/queue/pop.cpp
index 499309a41079ae7117a1e258d522885f3749529d..4e50200c086be7a386a46fba8fc94b880fdd9ce4 100644 (file)
--- a/test/stress/queue/pop.cpp
+++ b/test/stress/queue/pop.cpp
@@ -29,6 +29,7 @@
 */
 
 #include "queue_type.h"
+#include "../misc/common.h"
 
 // Multi-threaded queue test for pop operation
 namespace {
@@ -131,8 +132,8 @@ namespace {
             size_t nTotalPops = 0;
             for ( size_t i = 0; i < pool.size(); ++i ) {
                 Consumer<Queue>& thread = static_cast<Consumer<Queue>&>(pool.get( i ));
-                for ( size_t i = 0; i < s_nQueueSize; ++i )
-                    arr[i] += thread.m_arr[i];
+                for ( size_t j = 0; j < s_nQueueSize; ++j )
+                    arr[j] += thread.m_arr[j];
                 nTotalPops += thread.m_nPopCount;
             }
             EXPECT_EQ( nTotalPops, s_nQueueSize );
@@ -160,7 +161,7 @@ namespace {
 
             propout() << std::make_pair( "duration", duration );
 
-            analyze( q );
+            DEBUG(analyze( q ));
 
             propout() << q.statistics();
         }
@@ -170,10 +171,7 @@ namespace {
     CDSSTRESS_MoirQueue( queue_pop )
     CDSSTRESS_BasketQueue( queue_pop )
     CDSSTRESS_OptimsticQueue( queue_pop )
-    CDSSTRESS_FCQueue( queue_pop )
-    CDSSTRESS_FCDeque( queue_pop )
     CDSSTRESS_RWQueue( queue_pop )
-    CDSSTRESS_StdQueue( queue_pop )
 
 #undef CDSSTRESS_Queue_F
 #define CDSSTRESS_Queue_F( test_fixture, type_name ) \
@@ -252,7 +250,7 @@ namespace {
 #else
     INSTANTIATE_TEST_CASE_P( SQ,
         segmented_queue_pop,
-        ::testing::ValuesIn( segmented_queue_pop::get_test_parameters()) );
+        ::testing::ValuesIn( segmented_queue_pop::get_test_parameters()));
 #endif