From bb917e0ffe29a4cec9154d958191a33aade03ac9 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 14 Jan 2014 12:19:24 -0500 Subject: [PATCH] tests/benchmark: use urcu qsbr lib rather than recompile from source Signed-off-by: Mathieu Desnoyers --- tests/benchmark/Makefile.am | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index e889f88..3aa58a0 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -33,7 +33,7 @@ COMPAT+=$(top_srcdir)/compat_futex.c endif URCU=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) -URCU_QSBR=$(top_srcdir)/urcu-qsbr.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) +URCU_QSBR=xxxxxxxx$(top_srcdir)/urcu-qsbr.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) # URCU_MB uses urcu.c but -DRCU_MB must be defined URCU_MB=$(top_srcdir)/urcu.c $(top_srcdir)/urcu-pointer.c $(top_srcdir)/wfcqueue.c $(COMPAT) # URCU_SIGNAL uses urcu.c but -DRCU_SIGNAL must be defined @@ -62,9 +62,11 @@ test_urcu_yield_SOURCES = test_urcu.c $(URCU) test_urcu_yield_CFLAGS = -DDEBUG_YIELD $(AM_CFLAGS) -test_urcu_qsbr_SOURCES = test_urcu_qsbr.c $(URCU_QSBR) +test_urcu_qsbr_SOURCES = test_urcu_qsbr.c +test_urcu_qsbr_LDADD = $(URCU_QSBR_LIB) -test_urcu_qsbr_timing_SOURCES = test_urcu_qsbr_timing.c $(URCU_QSBR) +test_urcu_qsbr_timing_SOURCES = test_urcu_qsbr_timing.c +test_urcu_qsbr_timing_LDADD = $(URCU_QSBR_LIB) test_urcu_mb_SOURCES = test_urcu.c $(URCU_MB) @@ -104,9 +106,11 @@ test_urcu_signal_gc_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS) test_urcu_mb_gc_SOURCES = test_urcu_gc.c $(URCU_MB) test_urcu_mb_gc_CFLAGS = -DRCU_MB $(AM_CFLAGS) -test_urcu_qsbr_gc_SOURCES = test_urcu_qsbr_gc.c $(URCU_QSBR) +test_urcu_qsbr_gc_SOURCES = test_urcu_qsbr_gc.c +test_urcu_qsbr_gc_LDADD = $(URCU_QSBR_LIB) -test_urcu_qsbr_lgc_SOURCES = test_urcu_qsbr_gc.c $(URCU_QSBR) +test_urcu_qsbr_lgc_SOURCES = test_urcu_qsbr_gc.c +test_urcu_qsbr_lgc_LDADD = $(URCU_QSBR_LIB) test_urcu_qsbr_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS) test_urcu_lgc_SOURCES = test_urcu_gc.c $(URCU) @@ -118,7 +122,8 @@ test_urcu_signal_lgc_CFLAGS = -DRCU_SIGNAL -DTEST_LOCAL_GC $(AM_CFLAGS) test_urcu_mb_lgc_SOURCES = test_urcu_gc.c $(URCU_MB) test_urcu_mb_lgc_CFLAGS = -DTEST_LOCAL_GC -DRCU_MB $(AM_CFLAGS) -test_urcu_qsbr_dynamic_link_SOURCES = test_urcu_qsbr.c $(URCU_QSBR) +test_urcu_qsbr_dynamic_link_SOURCES = test_urcu_qsbr.c +test_urcu_qsbr_dynamic_link_LDADD = $(URCU_QSBR_LIB) test_urcu_qsbr_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_defer_SOURCES = test_urcu_defer.c $(URCU_DEFER) -- 2.34.1