Trims down unnecessary set cases

[libcds.git] / test / stress / set / delodd / set_delodd_ellentree.cpp

diff --git a/test/stress/set/delodd/set_delodd_ellentree.cpp b/test/stress/set/delodd/set_delodd_ellentree.cpp
index 85ded33dfb1a250002c2ff48ed81f4a196808c7f..49dbfff9a67833dd9d748010aa6635ccd79d71fa 100644 (file)
--- a/test/stress/set/delodd/set_delodd_ellentree.cpp
+++ b/test/stress/set/delodd/set_delodd_ellentree.cpp
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,42 +25,14 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "set_delodd.h"
 #include "set_type_ellen_bintree.h"
 
-#define CDSSTRESS_EllenBinTreeSet( ellen_set_type ) \
-    TEST_F( Set_DelOdd, ellen_set_type ) \
-    { \
-        typedef set::set_type< tag_EllenBinTreeSet, key_thread, size_t >::ellen_set_type set_type; \
-        run_test_extract<set_type>(); \
-    }
-
 namespace set {
 
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_hp )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_dhp )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_gpi )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_gpb )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_gpt )
-#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_shb )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_sht )
-#endif
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_yield_hp )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_yield_dhp )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_yield_rcu_gpb )
-
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_hp_stat )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_dhp_stat )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_gpi_stat )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_gpb_stat )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_gpt_stat )
-#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_shb_stat )
-    CDSSTRESS_EllenBinTreeSet( EllenBinTreeSet_rcu_sht_stat )
-#endif
+    CDSSTRESS_EllenBinTreeSet( Set_DelOdd, run_test_extract, key_thread, size_t )
 
 } // namespace set