tests: Remove check/test/tests subdir targets

Since commit a62de618 (Build util tests properly with make check),
running 'make check' in tests/ also runs 'make check' in each of the
tests subdirectories, which builds the tests in that dir. (And the
same goes for 'make test' and 'make tests'.)

This does ensure that the tests are built before we run them, but it's
a bit strange to build the tests under 'make check', a target that
usually runs tests.

We do this in the top-level tests dir to make sure that the tests are
built, but this purpose is served by the existing 'make all' target.
So to reduce some duplication of logic, and reduce the number of
targets the subdirs need to implement, just have 'make check' depend
on 'make all', so we know the tests are built when we go to run them.

Change-Id: I2fcbe88daeeae94cd7ef7a4a8326c4b56fadee5a
Reviewed-on: https://gerrit.openafs.org/14636
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Andrew Deason 2021-06-07 16:44:38 -05:00 committed by Benjamin Kaduk
parent 981bc005f8
commit 41dd504fe1
9 changed files with 9 additions and 10 deletions

View File

@ -31,8 +31,7 @@ RUNTESTS_DEFAULT_=$(RUNTESTS_V$(V)_DEFAULT)
RUNTESTS_ARGS=$(RUNTESTS_DEFAULT_$(TESTS)) $(TESTS)
# To run specific tests, run e.g. 'make check TESTS="rx/foo opr/foo"'
check test tests: runtests
@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done
check test tests: all runtests
MAKECHECK=1 $(abs_top_srcdir)/tests/libwrap @TOP_OBJDIR@/lib \
./runtests $(RUNTESTS_ARGS)

View File

@ -8,7 +8,7 @@ BINS = authcon-t superuser-t keys-t realms-t writekeyfile
MODULE_CFLAGS=-I$(TOP_OBJDIR) -I$(srcdir)/../common/
all check test tests: $(BINS)
all: $(BINS)
MODULE_LIBS = $(abs_top_builddir)/tests/common/libafstest_common.la \
$(abs_top_builddir)/src/auth/liboafs_auth.la \

View File

@ -14,7 +14,7 @@ LIBS = $(abs_top_builddir)/tests/common/libafstest_common.la \
BINS = command-t
all check test tests: $(BINS)
all: $(BINS)
command-t: command-t.o $(LIBS)
$(LT_LDRULE_static) command-t.o $(LIBS) $(LIB_roken) $(XLIBS)

View File

@ -12,7 +12,7 @@ LT_libs = $(LIB_rfc3961) $(LIB_roken)
LT_deps = $(top_builddir)/tests/tap/libafstest_tap.la \
$(top_builddir)/src/util/liboafs_util.la
all check test tests: libafstest_common.la
all: libafstest_common.la
# This library is just used internally for our tests, so use
# LT_LDLIB_shlib_internal so we don't need to manage a .sym export list.

View File

@ -11,7 +11,7 @@ LIBS= $(abs_top_builddir)/tests/common/libafstest_common.la \
BINS = cache-t dict-t fmt-t jhash-t queues-t rbtree-t softsig-helper time-t \
uuid-t
all check test tests: $(BINS)
all: $(BINS)
cache-t: cache-t.o $(LIBS)
$(LT_LDRULE_static) cache-t.o $(LIBS) $(XLIBS)

View File

@ -12,7 +12,7 @@ LIBS = $(abs_top_builddir)/tests/common/libafstest_common.la \
BINS = event-t
all check test tests: $(BINS)
all: $(BINS)
event-t: event-t.o $(LIBS)
$(LT_LDRULE_static) event-t.o $(LIBS) $(LIB_roken) $(XLIBS)

View File

@ -7,7 +7,7 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
LT_objs = basic.lo
all check test tests: libafstest_tap.la basic.h macros.h libtap.sh
all: libafstest_tap.la basic.h macros.h libtap.sh
CFLAGS_basic.lo = @CFLAGS_NOERROR@ -I$(tapdir)/../..
basic.lo: $(tapdir)/basic.c $(tapdir)/basic.h

View File

@ -14,7 +14,7 @@ LIBS = $(abs_top_builddir)/tests/common/libafstest_common.la \
BINS = ktime-t exec-alt-t volutil-t
all check test tests: $(BINS)
all: $(BINS)
ktime-t: ktime-t.lo $(LIBS)
$(LT_LDRULE_static) ktime-t.lo $(LIBS) $(XLIBS)

View File

@ -8,7 +8,7 @@ BINS = vos-t
MODULE_CFLAGS=-I$(TOP_OBJDIR) -I$(srcdir)/../common/
all check test tests: $(BINS)
all: $(BINS)
MODULE_LIBS = $(abs_top_builddir)/tests/common/libafstest_common.la \
$(abs_top_builddir)/src/vlserver/liboafs_vldb.la \