From 7c2016d882ea471c4dcb665001dc21cf6b1d7acc Mon Sep 17 00:00:00 2001 From: Peizhao Ou Date: Wed, 14 Feb 2018 16:24:41 -0800 Subject: [PATCH] Disable SPSC test cases for some queues --- test/stress/freelist/put_get_single.cpp | 3 +++ test/stress/queue/CMakeLists.txt | 6 +++--- test/stress/queue/spsc_queue.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/test/stress/freelist/put_get_single.cpp b/test/stress/freelist/put_get_single.cpp index 2ac23b9c..d0ebddcd 100644 --- a/test/stress/freelist/put_get_single.cpp +++ b/test/stress/freelist/put_get_single.cpp @@ -102,6 +102,9 @@ namespace { s_nThreadCount = 1; if ( s_nPassCount == 0 ) s_nPassCount = 1000; + + // Override the pass count. + s_nPassCount = cfg.get_size_t("PutGetSinglePassCount", s_nPassCount); } //static void TearDownTestCase(); diff --git a/test/stress/queue/CMakeLists.txt b/test/stress/queue/CMakeLists.txt index a11b55c0..5d392f8d 100644 --- a/test/stress/queue/CMakeLists.txt +++ b/test/stress/queue/CMakeLists.txt @@ -60,9 +60,9 @@ set(CDSSTRESS_SPSC_QUEUE_SOURCES spsc_queue.cpp spsc_buffer.cpp ) -#add_executable(${CDSSTRESS_SPSC_QUEUE} ${CDSSTRESS_SPSC_QUEUE_SOURCES}) -#target_link_libraries(${CDSSTRESS_SPSC_QUEUE} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY}) -#add_test(NAME ${CDSSTRESS_SPSC_QUEUE} COMMAND ${CDSSTRESS_SPSC_QUEUE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) +add_executable(${CDSSTRESS_SPSC_QUEUE} ${CDSSTRESS_SPSC_QUEUE_SOURCES}) +target_link_libraries(${CDSSTRESS_SPSC_QUEUE} ${CDS_TEST_LIBRARIES} ${CDSSTRESS_FRAMEWORK_LIBRARY}) +add_test(NAME ${CDSSTRESS_SPSC_QUEUE} COMMAND ${CDSSTRESS_SPSC_QUEUE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) # stress-queue diff --git a/test/stress/queue/spsc_queue.cpp b/test/stress/queue/spsc_queue.cpp index bc04b787..4fa440a6 100644 --- a/test/stress/queue/spsc_queue.cpp +++ b/test/stress/queue/spsc_queue.cpp @@ -200,13 +200,13 @@ namespace { } }; - CDSSTRESS_MSQueue( spsc_queue ) - CDSSTRESS_MoirQueue( spsc_queue ) - CDSSTRESS_BasketQueue( spsc_queue ) - CDSSTRESS_OptimsticQueue( spsc_queue ) + //CDSSTRESS_MSQueue( spsc_queue ) + //CDSSTRESS_MoirQueue( spsc_queue ) + //CDSSTRESS_BasketQueue( spsc_queue ) + //CDSSTRESS_OptimsticQueue( spsc_queue ) //CDSSTRESS_FCQueue( spsc_queue ) //CDSSTRESS_FCDeque( spsc_queue ) - CDSSTRESS_RWQueue( spsc_queue ) + //CDSSTRESS_RWQueue( spsc_queue ) //CDSSTRESS_StdQueue( spsc_queue ) #undef CDSSTRESS_Queue_F -- 2.34.1