EllenBinTreeMap, EllenBinTreeSet:

[libcds.git] / tests / unit / map2 / map_defs.h

diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h
index b7ecd466fe981b35c808e5894298873ad42ca221..9adc9845eed39602e4bbd2312f5001abc4d20d97 100644 (file)
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -409,16 +409,10 @@
 
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
 #   define CDSUNIT_DECLARE_EllenBinTreeMap_RCU_signal \
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_shb)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_shb_stat)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_sht)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_sht_stat)
-
-#   define CDSUNIT_DEFINE_EllenBinTreeMap_RCU_signal( IMPL, C ) \
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_shb)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_shb_stat)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_sht)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_sht_stat)
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_shb)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_shb_stat)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_sht)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_sht_stat)
 
 #   define CDSUNIT_TEST_EllenBinTreeMap_RCU_signal \
     CPPUNIT_TEST(EllenBinTreeMap_rcu_shb)\
@@ -427,42 +421,25 @@
     CPPUNIT_TEST(EllenBinTreeMap_rcu_sht_stat)
 #else
 #   define CDSUNIT_DECLARE_EllenBinTreeMap_RCU_signal
-#   define CDSUNIT_DEFINE_EllenBinTreeMap_RCU_signal( IMPL, C )
 #   define CDSUNIT_TEST_EllenBinTreeMap_RCU_signal
 #endif
 
 #define CDSUNIT_DECLARE_EllenBinTreeMap \
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_hp)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_hp_yield)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_hp_stat)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_dhp)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_dhp_yield)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_dhp_stat)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpi)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpi_stat)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpb)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpb_yield)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpb_stat)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpt)\
-    CDSUNIT_DECLARE_TEST(EllenBinTreeMap_rcu_gpt_stat)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_hp)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_hp_yield)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_hp_stat)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_dhp)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_dhp_yield)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_dhp_stat)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpi)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpi_stat)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpb)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpb_yield)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpb_stat)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpt)\
+    TEST_CASE(tag_EllenBinTreeMap, EllenBinTreeMap_rcu_gpt_stat)\
     CDSUNIT_DECLARE_EllenBinTreeMap_RCU_signal
 
-#define CDSUNIT_DEFINE_EllenBinTreeMap( IMPL, C ) \
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_hp)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_hp_yield)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_hp_stat)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_dhp)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_dhp_yield)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_dhp_stat)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpi)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpi_stat)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpb)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpb_yield)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpb_stat)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpt)\
-    TEST_MAP_NOLF_EXTRACT(IMPL, C, EllenBinTreeMap_rcu_gpt_stat)\
-    CDSUNIT_DEFINE_EllenBinTreeMap_RCU_signal( IMPL, C )
-
 #define CDSUNIT_TEST_EllenBinTreeMap \
     CPPUNIT_TEST(EllenBinTreeMap_hp)\
     CPPUNIT_TEST(EllenBinTreeMap_hp_yield)\