use @HAVE_RUNTEST@ in deciding which tests to run

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14661 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog
index 6ceb3697912baa062d2186477ce56d4b130234d5..3742433599b8d1db88719bae6589ac62abace033 100644 (file)
--- a/src/tests/dejagnu/ChangeLog
+++ b/src/tests/dejagnu/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (RUNTEST): Variable renamed from HAVE_RUNTEST.
+       (check): Depend on check-runtest-@HAVE_RUNTEST@.
+       (check-runtest-yes, check-runtest-no): Renamed from check-runtest,
+       check-.
+
 2002-07-12  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (HAVE_RUNTEST): Include $(DEJAFLAGS).

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index fa4742526703028d1d24e13e86b4f77187081433..4400c98b0906b4cf3bb8f19da8d015f409aec136 100644 (file)
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=tests/dejagnu
 mydir=dejagnu
 BUILDTOP=$(REL)$(U)$(S)$(U)
-HAVE_RUNTEST = @RUNTEST@ $(DEJAFLAGS)
+RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =
 KRB5_RUN_ENV= @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -13,16 +13,16 @@ SRCS=$(srcdir)/t_inetd.c
 
 all install::
 
-check:: check-$(HAVE_RUNTEST)
+check:: check-runtest-@HAVE_RUNTEST@
 
-check-::
+check-runtest-no::
        @echo "+++"
        @echo "+++ WARNING: tests/dejagnu tests not run."
        @echo "+++ runtest is unavailable."
        @echo "+++"
 
-check-runtest:: t_inetd site.exp
-       $(HAVE_RUNTEST) --tool krb --srcdir $(srcdir) $(KRB4_RUNTESTFLAGS) $(RUNTESTFLAGS)
+check-runtest-yes:: t_inetd site.exp
+       $(RUNTEST) --tool krb --srcdir $(srcdir) $(KRB4_RUNTESTFLAGS) $(RUNTESTFLAGS)
 
 t_inetd:: t_inetd.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS)