Merge pull request #28 from Rapotkinnik/upstream

[libcds.git] / projects / source.test-hdr.mk

diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk
index 740cffceac7144eef260c829bc2dacaec278286f..0f27e11f97ff14f4b22bf1f2afa754f6800b5d8b 100644 (file)
--- a/projects/source.test-hdr.mk
+++ b/projects/source.test-hdr.mk
@@ -24,7 +24,7 @@ CDS_TESTHDR_MAP := \
     tests/test-hdr/map/hdr_refinable_hashmap_boost_unordered_map.cpp \
     tests/test-hdr/map/hdr_refinable_hashmap_slist.cpp \
     tests/test-hdr/map/hdr_skiplist_map_hp.cpp \
-    tests/test-hdr/map/hdr_skiplist_map_ptb.cpp \
+    tests/test-hdr/map/hdr_skiplist_map_dhp.cpp \
     tests/test-hdr/map/hdr_skiplist_map_rcu_gpi.cpp \
     tests/test-hdr/map/hdr_skiplist_map_rcu_gpb.cpp \
     tests/test-hdr/map/hdr_skiplist_map_rcu_gpt.cpp \
@@ -32,7 +32,7 @@ CDS_TESTHDR_MAP := \
     tests/test-hdr/map/hdr_skiplist_map_rcu_sht.cpp \
     tests/test-hdr/map/hdr_skiplist_map_nogc.cpp \
     tests/test-hdr/map/hdr_splitlist_map_hp.cpp \
-    tests/test-hdr/map/hdr_splitlist_map_ptb.cpp \
+    tests/test-hdr/map/hdr_splitlist_map_dhp.cpp \
     tests/test-hdr/map/hdr_splitlist_map_nogc.cpp \
     tests/test-hdr/map/hdr_splitlist_map_rcu_gpi.cpp \
     tests/test-hdr/map/hdr_splitlist_map_rcu_gpb.cpp \
@@ -40,7 +40,7 @@ CDS_TESTHDR_MAP := \
     tests/test-hdr/map/hdr_splitlist_map_rcu_shb.cpp \
     tests/test-hdr/map/hdr_splitlist_map_rcu_sht.cpp \
     tests/test-hdr/map/hdr_splitlist_map_lazy_hp.cpp \
-    tests/test-hdr/map/hdr_splitlist_map_lazy_ptb.cpp \
+    tests/test-hdr/map/hdr_splitlist_map_lazy_dhp.cpp \
     tests/test-hdr/map/hdr_splitlist_map_lazy_nogc.cpp \
     tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpi.cpp \
     tests/test-hdr/map/hdr_splitlist_map_lazy_rcu_gpb.cpp \
@@ -60,39 +60,41 @@ CDS_TESTHDR_MAP := \
 CDS_TESTHDR_DEQUE := \
     tests/test-hdr/deque/hdr_fcdeque.cpp
 
-CDS_TESTHDR_ORDLIST := \
-    tests/test-hdr/ordered_list/hdr_lazy_dhp.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_hp.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_rcu_gpi.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_rcu_gpb.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_rcu_gpt.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_rcu_shb.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_rcu_sht.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_dhp.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_hp.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpb.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpi.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_gpt.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_shb.cpp \
-    tests/test-hdr/ordered_list/hdr_lazy_kv_rcu_sht.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_dhp.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_hp.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_rcu_gpi.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_rcu_gpb.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_rcu_gpt.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_rcu_shb.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_rcu_sht.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_dhp.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_hp.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_nogc.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_rcu_gpi.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_rcu_gpb.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_rcu_gpt.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_rcu_shb.cpp \
-    tests/test-hdr/ordered_list/hdr_michael_kv_rcu_sht.cpp
+CDS_TESTHDR_LIST := \
+    tests/test-hdr/list/hdr_lazy_dhp.cpp \
+    tests/test-hdr/list/hdr_lazy_hp.cpp \
+    tests/test-hdr/list/hdr_lazy_nogc.cpp \
+    tests/test-hdr/list/hdr_lazy_nogc_unord.cpp \
+    tests/test-hdr/list/hdr_lazy_rcu_gpi.cpp \
+    tests/test-hdr/list/hdr_lazy_rcu_gpb.cpp \
+    tests/test-hdr/list/hdr_lazy_rcu_gpt.cpp \
+    tests/test-hdr/list/hdr_lazy_rcu_shb.cpp \
+    tests/test-hdr/list/hdr_lazy_rcu_sht.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_dhp.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_hp.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_nogc.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_nogc_unord.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_rcu_gpb.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_rcu_gpi.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_rcu_gpt.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_rcu_shb.cpp \
+    tests/test-hdr/list/hdr_lazy_kv_rcu_sht.cpp \
+    tests/test-hdr/list/hdr_michael_dhp.cpp \
+    tests/test-hdr/list/hdr_michael_hp.cpp \
+    tests/test-hdr/list/hdr_michael_nogc.cpp \
+    tests/test-hdr/list/hdr_michael_rcu_gpi.cpp \
+    tests/test-hdr/list/hdr_michael_rcu_gpb.cpp \
+    tests/test-hdr/list/hdr_michael_rcu_gpt.cpp \
+    tests/test-hdr/list/hdr_michael_rcu_shb.cpp \
+    tests/test-hdr/list/hdr_michael_rcu_sht.cpp \
+    tests/test-hdr/list/hdr_michael_kv_dhp.cpp \
+    tests/test-hdr/list/hdr_michael_kv_hp.cpp \
+    tests/test-hdr/list/hdr_michael_kv_nogc.cpp \
+    tests/test-hdr/list/hdr_michael_kv_rcu_gpi.cpp \
+    tests/test-hdr/list/hdr_michael_kv_rcu_gpb.cpp \
+    tests/test-hdr/list/hdr_michael_kv_rcu_gpt.cpp \
+    tests/test-hdr/list/hdr_michael_kv_rcu_shb.cpp \
+    tests/test-hdr/list/hdr_michael_kv_rcu_sht.cpp
 
 CDS_TESTHDR_PQUEUE := \
     tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_dyn.cpp \
@@ -136,7 +138,7 @@ CDS_TESTHDR_SET := \
     tests/test-hdr/set/hdr_intrusive_refinable_hashset_treapset.cpp \
     tests/test-hdr/set/hdr_intrusive_refinable_hashset_uset.cpp \
     tests/test-hdr/set/hdr_intrusive_skiplist_hp.cpp \
-    tests/test-hdr/set/hdr_intrusive_skiplist_ptb.cpp \
+    tests/test-hdr/set/hdr_intrusive_skiplist_dhp.cpp \
     tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpb.cpp \
     tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpi.cpp \
     tests/test-hdr/set/hdr_intrusive_skiplist_rcu_gpt.cpp \
@@ -226,26 +228,37 @@ CDS_TESTHDR_STACK := \
 CDS_TESTHDR_TREE := \
     tests/test-hdr/tree/hdr_tree_reg.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_hp.cpp \
-    tests/test-hdr/tree/hdr_intrusive_ellen_bintree_ptb.cpp \
+    tests/test-hdr/tree/hdr_intrusive_ellen_bintree_dhp.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpb.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpi.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_gpt.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_shb.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_rcu_sht.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_map_hp.cpp \
-    tests/test-hdr/tree/hdr_ellenbintree_map_ptb.cpp \
+    tests/test-hdr/tree/hdr_ellenbintree_map_dhp.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_map_rcu_gpb.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_map_rcu_gpi.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_map_rcu_gpt.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_map_rcu_shb.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_map_rcu_sht.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_set_hp.cpp \
-    tests/test-hdr/tree/hdr_ellenbintree_set_ptb.cpp \
+    tests/test-hdr/tree/hdr_ellenbintree_set_dhp.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_set_rcu_gpb.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_set_rcu_gpi.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_set_rcu_gpt.cpp \
     tests/test-hdr/tree/hdr_ellenbintree_set_rcu_shb.cpp \
-    tests/test-hdr/tree/hdr_ellenbintree_set_rcu_sht.cpp
+    tests/test-hdr/tree/hdr_ellenbintree_set_rcu_sht.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_gpb.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_gpb_pool_monitor.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_gpi.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_gpi_pool_monitor.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_gpt.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_gpt_pool_monitor.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_shb.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_shb_pool_monitor.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_sht.cpp \
+    tests/test-hdr/tree/hdr_bronson_avltree_map_rcu_sht_pool_monitor.cpp \
+    
 
 CDS_TESTHDR_MISC := \
     tests/test-hdr/misc/cxx11_atomic_class.cpp \
@@ -264,8 +277,8 @@ CDS_TESTHDR_SOURCES := \
     $(CDS_TESTHDR_STACK) \
     $(CDS_TESTHDR_MAP) \
     $(CDS_TESTHDR_DEQUE) \
-    $(CDS_TESTHDR_ORDLIST) \
+    $(CDS_TESTHDR_LIST) \
     $(CDS_TESTHDR_SET) \
     $(CDS_TESTHDR_TREE) \
     $(CDS_TESTHDR_MISC)
-    
\ No newline at end of file
+