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 <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5d5583b..3e17b51 100644 (file)
--- 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 4b17741..7d4e172 100644 (file)
--- 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 ff4beee..3bb1e1b 100644 (file)
--- 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: