Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...
authorkhizmax <khizmax@gmail.com>
Mon, 16 Jan 2017 09:15:15 +0000 (12:15 +0300)
committerkhizmax <khizmax@gmail.com>
Mon, 16 Jan 2017 09:15:15 +0000 (12:15 +0300)
1  2 
CMakeLists.txt
test/stress/data/test-debug.conf
test/stress/data/test.conf
test/stress/queue/push_pop.cpp
test/stress/queue/queue_type.h
test/unit/queue/fcqueue.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -546,8 -634,18 +588,17 @@@ namespace cds_test 
          test( queue ); \
      }
  
+ #define CDSSTRESS_FCQueue_F( test_fixture, type_name, level ) \
+     TEST_F( test_fixture, type_name ) \
+     { \
+         if ( !check_detail_level( level )) return; \
+         typedef queue::TypesFCHeavyValue< value_type >::type_name queue_type; \
+         queue_type queue; \
+         test( queue ); \
+     }
  #define CDSSTRESS_MSQueue( test_fixture ) \
      CDSSTRESS_Queue_F( test_fixture, MSQueue_HP,                0 ) \
 -    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_michaelAlloc,   0 ) \
      CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_seqcst,         2 ) \
      CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_ic,             1 ) \
      CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_stat,           0 ) \
Simple merge