X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=projects%2Fsource.test-hdr.mk;h=c6a5f39954737d01edae782cf5e4dea325f4b776;hb=d009d7b984cda7b5bfa9d7af83f7c69351b9fa94;hp=3e202ed435af8e42d2009111d927cae5e98e50b9;hpb=bd0c53a9b88b0d75044b6ce83c3cee49bb992aeb;p=libcds.git

diff --git a/projects/source.test-hdr.mk b/projects/source.test-hdr.mk
index 3e202ed4..c6a5f399 100644
--- a/projects/source.test-hdr.mk
+++ b/projects/source.test-hdr.mk
@@ -15,13 +15,13 @@ CDS_TESTHDR_MAP := \
     tests/test-hdr/map/hdr_michael_map_lazy_rcu_shb.cpp \
     tests/test-hdr/map/hdr_michael_map_lazy_rcu_sht.cpp \
     tests/test-hdr/map/hdr_michael_map_lazy_nogc.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_hp.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_dhp.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpb.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpi.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpt.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_rcu_shb.cpp \
-    tests/test-hdr/map/hdr_multilevel_hashmap_rcu_sht.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_hp.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_dhp.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_rcu_gpb.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_rcu_gpi.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_rcu_gpt.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_rcu_shb.cpp \
+    tests/test-hdr/map/hdr_feldman_hashmap_rcu_sht.cpp \
     tests/test-hdr/map/hdr_refinable_hashmap_hashmap_std.cpp \
     tests/test-hdr/map/hdr_refinable_hashmap_boost_list.cpp \
     tests/test-hdr/map/hdr_refinable_hashmap_list.cpp \
@@ -64,9 +64,6 @@ CDS_TESTHDR_MAP := \
     tests/test-hdr/map/hdr_striped_hashmap_slist.cpp \
     tests/test-hdr/map/hdr_striped_map_reg.cpp
 
-CDS_TESTHDR_DEQUE := \
-    tests/test-hdr/deque/hdr_fcdeque.cpp
-
 CDS_TESTHDR_LIST := \
     tests/test-hdr/list/hdr_lazy_dhp.cpp \
     tests/test-hdr/list/hdr_lazy_hp.cpp \
@@ -103,46 +100,14 @@ CDS_TESTHDR_LIST := \
     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 \
-    tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_static.cpp \
-    tests/test-hdr/priority_queue/hdr_mspqueue_dyn.cpp \
-    tests/test-hdr/priority_queue/hdr_mspqueue_static.cpp \
-    tests/test-hdr/priority_queue/hdr_fcpqueue_boost_stable_vector.cpp \
-    tests/test-hdr/priority_queue/hdr_fcpqueue_deque.cpp \
-    tests/test-hdr/priority_queue/hdr_fcpqueue_vector.cpp \
-    tests/test-hdr/priority_queue/hdr_priority_queue_reg.cpp
-
-CDS_TESTHDR_QUEUE := \
-    tests/test-hdr/queue/hdr_queue_register.cpp \
-    tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp \
-    tests/test-hdr/queue/hdr_intrusive_segmented_queue_hp.cpp \
-    tests/test-hdr/queue/hdr_intrusive_segmented_queue_dhp.cpp \
-    tests/test-hdr/queue/hdr_intrusive_tsigas_cycle_queue.cpp \
-    tests/test-hdr/queue/hdr_intrusive_vyukovmpmc_cycle_queue.cpp \
-    tests/test-hdr/queue/hdr_basketqueue_hp.cpp \
-    tests/test-hdr/queue/hdr_basketqueue_dhp.cpp \
-    tests/test-hdr/queue/hdr_fcqueue.cpp \
-    tests/test-hdr/queue/hdr_moirqueue_hp.cpp \
-    tests/test-hdr/queue/hdr_moirqueue_dhp.cpp \
-    tests/test-hdr/queue/hdr_msqueue_hp.cpp \
-    tests/test-hdr/queue/hdr_msqueue_dhp.cpp \
-    tests/test-hdr/queue/hdr_optimistic_hp.cpp \
-    tests/test-hdr/queue/hdr_optimistic_dhp.cpp \
-    tests/test-hdr/queue/hdr_rwqueue.cpp \
-    tests/test-hdr/queue/hdr_segmented_queue_hp.cpp \
-    tests/test-hdr/queue/hdr_segmented_queue_dhp.cpp \
-    tests/test-hdr/queue/hdr_tsigas_cycle_queue.cpp \
-    tests/test-hdr/queue/hdr_vyukov_mpmc_cyclic.cpp
-
 CDS_TESTHDR_SET := \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_hp.cpp \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_dhp.cpp \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_rcu_gpi.cpp \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_rcu_gpb.cpp \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_rcu_gpt.cpp \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_rcu_shb.cpp \
-    tests/test-hdr/set/hdr_intrusive_multilevel_hashset_rcu_sht.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_hp.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_dhp.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_rcu_gpi.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_rcu_gpb.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_rcu_gpt.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_rcu_shb.cpp \
+    tests/test-hdr/set/hdr_intrusive_feldman_hashset_rcu_sht.cpp \
     tests/test-hdr/set/hdr_intrusive_refinable_hashset_avlset.cpp \
     tests/test-hdr/set/hdr_intrusive_refinable_hashset_list.cpp \
     tests/test-hdr/set/hdr_intrusive_refinable_hashset_set.cpp \
@@ -184,13 +149,13 @@ CDS_TESTHDR_SET := \
     tests/test-hdr/set/hdr_michael_set_lazy_rcu_shb.cpp \
     tests/test-hdr/set/hdr_michael_set_lazy_rcu_sht.cpp \
     tests/test-hdr/set/hdr_michael_set_lazy_nogc.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_hp.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_dhp.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_rcu_gpb.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_rcu_gpi.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_rcu_gpt.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_rcu_shb.cpp \
-    tests/test-hdr/set/hdr_multilevel_hashset_rcu_sht.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_hp.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_dhp.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_rcu_gpb.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_rcu_gpi.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_rcu_gpt.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_rcu_shb.cpp \
+    tests/test-hdr/set/hdr_feldman_hashset_rcu_sht.cpp \
     tests/test-hdr/set/hdr_refinable_hashset_hashset_std.cpp \
     tests/test-hdr/set/hdr_refinable_hashset_boost_flat_set.cpp \
     tests/test-hdr/set/hdr_refinable_hashset_boost_list.cpp \
@@ -238,14 +203,6 @@ CDS_TESTHDR_SET := \
     tests/test-hdr/set/hdr_striped_hashset_slist.cpp \
     tests/test-hdr/set/hdr_striped_hashset_vector.cpp 
 
-CDS_TESTHDR_STACK := \
-    tests/test-hdr/stack/hdr_intrusive_fcstack.cpp \
-    tests/test-hdr/stack/hdr_treiber_stack_hp.cpp \
-    tests/test-hdr/stack/hdr_treiber_stack_dhp.cpp \
-    tests/test-hdr/stack/hdr_elimination_stack_hp.cpp \
-    tests/test-hdr/stack/hdr_elimination_stack_dhp.cpp \
-    tests/test-hdr/stack/hdr_fcstack.cpp
-
 CDS_TESTHDR_TREE := \
     tests/test-hdr/tree/hdr_tree_reg.cpp \
     tests/test-hdr/tree/hdr_intrusive_ellen_bintree_hp.cpp \
@@ -294,11 +251,7 @@ CDS_TESTHDR_MISC := \
     tests/test-hdr/misc/thread_init_fini.cpp
 
 CDS_TESTHDR_SOURCES := \
-    $(CDS_TESTHDR_QUEUE) \
-    $(CDS_TESTHDR_PQUEUE) \
-    $(CDS_TESTHDR_STACK) \
     $(CDS_TESTHDR_MAP) \
-    $(CDS_TESTHDR_DEQUE) \
     $(CDS_TESTHDR_LIST) \
     $(CDS_TESTHDR_SET) \
     $(CDS_TESTHDR_TREE) \