From e88e369c92e8a0c4bedd136edadb21d99988d587 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 28 Apr 2011 16:10:23 -0700 Subject: [PATCH] Fix various build problems with the test suite The cmd/command-t test requires libroken and was misspelled in the TESTS file. Multiple tests require LD_LIBRARY_PATH to be set to find libafsroken if it hasn't been installed, so set it when running runtests via make check. (Note that this means runtests -o will not work properly unless the user also sets LD_LIBRARY_PATH.) Change-Id: Ib64f0505b3b75db33adb6c7b6452dcaac0b05dbc Reviewed-on: http://gerrit.openafs.org/4594 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- tests/Makefile.in | 3 ++- tests/TESTS | 2 +- tests/cmd/Makefile.in | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.in b/tests/Makefile.in index 5d5583b5ee..3e17b51946 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -19,7 +19,8 @@ runtests: runtests.o check test tests: runtests @for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done - ./runtests $(abs_top_srcdir)/tests/TESTS + LD_LIBRARY_PATH=@TOP_OBJDIR@/lib \ + ./runtests $(abs_top_srcdir)/tests/TESTS install: diff --git a/tests/TESTS b/tests/TESTS index 4b17741c69..7d4e172174 100644 --- a/tests/TESTS +++ b/tests/TESTS @@ -4,5 +4,5 @@ util/queues auth/keys auth/superuser auth/authcon -cmd/commands +cmd/command ptserver/pt_util diff --git a/tests/cmd/Makefile.in b/tests/cmd/Makefile.in index ff4beeefe1..3bb1e1bafa 100644 --- a/tests/cmd/Makefile.in +++ b/tests/cmd/Makefile.in @@ -9,7 +9,7 @@ MODULE_CFLAGS = -I$(srcdir)/.. LIBS = ../tap/libtap.a \ $(abs_top_builddir)/lib/libcmd.a \ - $(abs_top_builddir)/lib/libcom_err.a \ + $(abs_top_builddir)/lib/libafscom_err.a \ $(abs_top_builddir)/lib/util.a tests = command-t @@ -17,7 +17,7 @@ tests = command-t all check test tests: $(tests) command-t: command-t.o $(LIBS) - $(AFS_LDRULE) command-t.o $(LIBS) $(XLIBS) + $(AFS_LDRULE) command-t.o $(LIBS) $(LIB_roken) $(XLIBS) install: