X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=tests%2FMakefile.in;h=23f1fa096a4cba2c513992619812ed660110c696;hp=462afcfb06fdfe10f80011bc649250021cd8db10;hb=d833ba768064a32a19c6b0b94ffb0d8a3a40a089;hpb=0af17e7eccb79dd7d618c98dc0b489d55209df50

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 462afcf..23f1fa0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 # Build rules for the OpenAFS test suite.
 
-srcdir=@srcdir@
+srcdir=@srcdir@/../src/external/c-tap-harness/tests
 abs_top_srcdir=@abs_top_srcdir@
 abs_top_builddir=@abs_top_builddir@
 include @TOP_OBJDIR@/src/config/Makefile.config
@@ -9,25 +9,24 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 MODULE_CFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \
 	-DBUILD='"$(abs_top_builddir)/tests"'
 
+SUBDIRS = tap common auth util cmd volser opr rx
+
 all: runtests
-	cd tap && $(MAKE) $@
-	cd auth && $(MAKE) $@
-	cd rxgk && $(MAKE) $@
-	cd util && $(MAKE) $@
+	@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done
 
 runtests: runtests.o
 	$(AFS_LDRULE) runtests.o
 
+runtests.o: $(srcdir)/runtests.c
+	$(AFS_CCRULE) $(srcdir)/runtests.c
+
 check test tests: runtests
-	cd tap && $(MAKE) $@
-	cd auth && $(MAKE) $@
-	cd util && $(MAKE) $@
-	./runtests $(abs_top_srcdir)/tests/TESTS
+	@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done
+	MAKECHECK=1 ./libwrap @TOP_OBJDIR@/lib \
+	    ./runtests $(abs_top_srcdir)/tests/TESTS
 
 install:
 
 clean distclean:
-	cd tap && $(MAKE) $@
-	cd auth && $(MAKE) $@
-	cd util && $(MAKE) $@
+	@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done
 	$(RM) -f *.o core runtests