From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 3 Sep 2011 19:24:48 +0000 (-0400)
Subject: Merge branch 'urcu/ht' into urcu/ht-benchmarks
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2f3bf444d54e21c5be7a70e33508c460e2ac53c8;p=userspace-rcu.git

Merge branch 'urcu/ht' into urcu/ht-benchmarks
---

2f3bf444d54e21c5be7a70e33508c460e2ac53c8
diff --cc tests/Makefile.am
index 6e4db4d,9e5940f..c2813da
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -177,13 -176,9 +177,13 @@@ test_urcu_wfs_dynlink_CFLAGS = -DDYNAMI
  test_urcu_wfs_dynlink_LDADD = $(URCU_COMMON_LIB)
  
  test_urcu_hash_SOURCES = test_urcu_hash.c $(COMPAT)
- test_urcu_hash_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS)
- test_urcu_hash_LDADD = $(URCU) $(URCU_CDS_LIB)
+ test_urcu_hash_CFLAGS = -DRCU_QSBR $(AM_CFLAGS)
+ test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB)
  
 +test_glib_hash_SOURCES = test_glib_hash.c $(COMPAT)
 +test_glib_hash_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS) -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
 +test_glib_hash_LDADD = $(URCU) $(URCU_CDS_LIB) -lglib-2.0
 +
  urcutorture.c: api.h
  
  check-am: