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

[userspace-rcu.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e5940f749b8e335961785a556b4de1d1a2d8772..c2813da6af49af1423f3d7bc62ad2493ddb0cca5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 AM_LDFLAGS=-lpthread
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -g
+AM_CFLAGS=$(PACKAGE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -g
 
 noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
        test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \
@@ -15,7 +15,8 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
         test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \
        test_urcu_lfq test_urcu_wfq test_urcu_lfs test_urcu_wfs \
        test_urcu_wfq_dynlink test_urcu_wfs_dynlink \
-       test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash
+       test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash \
+       test_glib_hash
 noinst_HEADERS = rcutorture.h
 
 if COMPAT_ARCH
@@ -179,6 +180,10 @@ test_urcu_hash_SOURCES = test_urcu_hash.c $(COMPAT)
 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: