From dca06bd10493eaea7565c42417bd0dbd0dc03b82 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 16 Sep 2012 19:54:48 +0100 Subject: [PATCH] tests: Convert opr tests to use libtool Avoid the problems with libopr's dependencies by just converting the tests to use the libtool version of the opr library. While we're at it, make the tests pthreaded too. Change-Id: I4e570b288ea57c758c848be1d545e5ee59771ab9 Reviewed-on: http://gerrit.openafs.org/8127 Reviewed-by: Jason Edgecombe Tested-by: Jason Edgecombe Tested-by: BuildBot Reviewed-by: Derrick Brashear --- tests/opr/Makefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/opr/Makefile.in b/tests/opr/Makefile.in index e276dc4..3719ce0 100644 --- a/tests/opr/Makefile.in +++ b/tests/opr/Makefile.in @@ -1,30 +1,30 @@ srcdir=@srcdir@ abs_top_builddir=@abs_top_builddir@ include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.lwp +include @TOP_OBJDIR@/src/config/Makefile.pthread MODULE_CFLAGS = -I$(srcdir)/../.. -LIBS=../tap/libtap.a $(abs_top_builddir)/lib/libopr.a +LIBS=../tap/libtap.a $(abs_top_builddir)/src/opr/liboafs_opr.la tests = jhash-t queues-t rbtree-t time-t uuid-t all check test tests: $(tests) queues-t: queues-t.o - $(AFS_LDRULE) queues-t.o ../tap/libtap.a $(XLIBS) + $(LT_LDRULE_static) queues-t.o ../tap/libtap.a $(XLIBS) rbtree-t: rbtree-t.o $(LIBS) - $(AFS_LDRULE) rbtree-t.o ../tap/libtap.a $(LIBS) $(XLIBS) + $(LT_LDRULE_static) rbtree-t.o ../tap/libtap.a $(LIBS) $(XLIBS) jhash-t: jhash-t.o - $(AFS_LDRULE) jhash-t.o ../tap/libtap.a $(XLIBS) + $(LT_LDRULE_static) jhash-t.o ../tap/libtap.a $(XLIBS) time-t: time-t.o - $(AFS_LDRULE) time-t.o ../tap/libtap.a $(XLIBS) + $(LT_LDRULE_static) time-t.o ../tap/libtap.a $(XLIBS) uuid-t: uuid-t.o - $(AFS_LDRULE) uuid-t.o ../tap/libtap.a $(LIBS) $(LIB_hcrypto) $(XLIBS) + $(LT_LDRULE_static) uuid-t.o ../tap/libtap.a $(LIBS) $(XLIBS) clean distclean: $(RM) -f $(tests) *.o core -- 1.9.4