Mathieu, when you merged this it seems the test_qsbr files got deleted instead of renamed.
Now compilation fails because it can't find them: CC test_urcu_mb-urcu-pointer.o CC test_urcu_mb-wfqueue.o CCLD test_urcu_mb make[2]: *** No rule to make target `test_urcu_qsbr_timing.o', needed by `test_urcu_qsbr_timing'. Stop. On 11-10-10 11:21 PM, Lai Jiangshan wrote: > commit ebff0094a4e2cbf392c62d21a0eb861a6cee6c29 > Author: Lai Jiangshan <[email protected]> > Date: Tue Oct 11 11:07:17 2011 +0800 > > rename test_qsbr to test_urcu_qsbr > > Signed-off-by: Lai Jiangshan <[email protected]> > --- > tests/Makefile.am | 28 > ++++++++++---------- > tests/{test_qsbr.c => test_urcu_qsbr.c} | 0 > tests/{test_qsbr_gc.c => test_urcu_qsbr_gc.c} | 0 > ...{test_qsbr_timing.c => test_urcu_qsbr_timing.c} | 0 > 4 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/tests/Makefile.am b/tests/Makefile.am > index 7c638ed..05a8024 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -5,12 +5,12 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link > test_urcu_timing \ > test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \ > test_rwlock_timing test_rwlock test_perthreadlock_timing \ > test_perthreadlock test_urcu_yield test_urcu_signal_yield > test_urcu_mb \ > - test_qsbr_timing test_qsbr rcutorture_urcu rcutorture_urcu_signal \ > - rcutorture_urcu_mb rcutorture_urcu_bp rcutorture_qsbr \ > + test_urcu_qsbr_timing test_urcu_qsbr rcutorture_urcu > rcutorture_urcu_signal \ > + rcutorture_urcu_mb rcutorture_urcu_bp rcutorture_urcu_qsbr \ > test_mutex test_looplen test_urcu_gc test_urcu_signal_gc \ > test_urcu_lgc \ > - test_urcu_mb_gc test_qsbr_gc test_qsbr_lgc test_urcu_signal_lgc \ > - test_urcu_mb_lgc test_qsbr_dynamic_link test_urcu_defer \ > + test_urcu_mb_gc test_urcu_qsbr_gc test_urcu_qsbr_lgc > test_urcu_signal_lgc \ > + test_urcu_mb_lgc test_urcu_qsbr_dynamic_link test_urcu_defer \ > test_uatomic test_urcu_assign test_urcu_assign_dynamic_link \ > test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \ > test_urcu_lfq test_urcu_wfq test_urcu_lfs test_urcu_wfs \ > @@ -58,9 +58,9 @@ test_urcu_yield_SOURCES = test_urcu.c $(URCU) > test_urcu_yield_CFLAGS = -DDEBUG_YIELD $(AM_CFLAGS) > > > -test_qsbr_SOURCES = test_qsbr.c $(URCU_QSBR) > +test_urcu_qsbr_SOURCES = test_urcu_qsbr.c $(URCU_QSBR) > > -test_qsbr_timing_SOURCES = test_qsbr_timing.c $(URCU_QSBR) > +test_urcu_qsbr_timing_SOURCES = test_urcu_qsbr_timing.c $(URCU_QSBR) > > > test_urcu_mb_SOURCES = test_urcu.c $(URCU_MB) > @@ -98,9 +98,9 @@ rcutorture_urcu_mb_SOURCES = urcutorture.c > rcutorture_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS) > rcutorture_urcu_mb_LDADD = $(URCU_MB_LIB) > > -rcutorture_qsbr_SOURCES = urcutorture.c > -rcutorture_qsbr_CFLAGS = -DTORTURE_QSBR -DRCU_QSBR $(AM_CFLAGS) > -rcutorture_qsbr_LDADD = $(URCU_QSBR_LIB) > +rcutorture_urcu_qsbr_SOURCES = urcutorture.c > +rcutorture_urcu_qsbr_CFLAGS = -DTORTURE_QSBR -DRCU_QSBR $(AM_CFLAGS) > +rcutorture_urcu_qsbr_LDADD = $(URCU_QSBR_LIB) > > rcutorture_urcu_signal_SOURCES = urcutorture.c > rcutorture_urcu_signal_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS) > @@ -122,10 +122,10 @@ 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_qsbr_gc_SOURCES = test_qsbr_gc.c $(URCU_QSBR) > +test_urcu_qsbr_gc_SOURCES = test_urcu_qsbr_gc.c $(URCU_QSBR) > > -test_qsbr_lgc_SOURCES = test_qsbr_gc.c $(URCU_QSBR) > -test_qsbr_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS) > +test_urcu_qsbr_lgc_SOURCES = test_urcu_qsbr_gc.c $(URCU_QSBR) > +test_urcu_qsbr_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS) > > test_urcu_lgc_SOURCES = test_urcu_gc.c $(URCU) > test_urcu_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS) > @@ -136,8 +136,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_qsbr_dynamic_link_SOURCES = test_qsbr.c $(URCU_QSBR) > -test_qsbr_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) > +test_urcu_qsbr_dynamic_link_SOURCES = test_urcu_qsbr.c $(URCU_QSBR) > +test_urcu_qsbr_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) > > test_urcu_defer_SOURCES = test_urcu_defer.c $(URCU_DEFER) > > diff --git a/tests/test_qsbr.c b/tests/test_urcu_qsbr.c > similarity index 100% > rename from tests/test_qsbr.c > rename to tests/test_urcu_qsbr.c > diff --git a/tests/test_qsbr_gc.c b/tests/test_urcu_qsbr_gc.c > similarity index 100% > rename from tests/test_qsbr_gc.c > rename to tests/test_urcu_qsbr_gc.c > diff --git a/tests/test_qsbr_timing.c b/tests/test_urcu_qsbr_timing.c > similarity index 100% > rename from tests/test_qsbr_timing.c > rename to tests/test_urcu_qsbr_timing.c > > _______________________________________________ > ltt-dev mailing list > [email protected] > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev -- Alexandre Montplaisir DORSAL lab, École Polytechnique de Montréal _______________________________________________ ltt-dev mailing list [email protected] http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
