From c9829c72f16d7e0326c7201cc88471468ca480ad Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Thu, 31 Oct 1996 13:45:25 +0000 Subject: [PATCH] * Makefile.in (check): Only run tests is Perl, tcl, runtest * configure.in: Check for Perl before running tests. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9257 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/unit-test/ChangeLog | 8 +++++++- src/lib/kadm5/unit-test/Makefile.in | 8 ++++---- src/lib/kadm5/unit-test/configure.in | 9 ++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index c1e65f655..ec764c114 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,4 +1,10 @@ -Fri Oct 25 16:43:52 1996 Ezra Peisach +Thu Oct 31 08:42:18 1996 Ezra Peisach + + * Makefile.in (check): Only run tests is Perl, tcl, runtest. + + * configure.in: Check for Perl before running tests. + +Fri Oct 25 16:43:52 1996 Ezra Peisach * Makefile.in (init-test): Add -UUSE_KADM5_API_VERSION before the -D of same. diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index dfa60ffeb..455f42880 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -46,12 +46,12 @@ server-iter-test: iter-test.o $(SRVDEPLIBS) # The unit-test targets # -check:: check-@RUNTEST@-@DO_TCL@ +check:: check-@DO_TEST@ -check-- check-runtest- check--tcl:: - @echo "Either tcl or runtest is unavailable. Kadm5 unit tests not run" +check-:: + @echo "Either tcl, runtest, or Perl is unavailable. Kadm5 unit tests not run" -check-runtest-tcl unit-test:: unit-test-client unit-test-server +check-ok unit-test:: unit-test-client unit-test-server unit-test-client: unit-test-client-setup unit-test-client-body \ unit-test-client-cleanup diff --git a/src/lib/kadm5/unit-test/configure.in b/src/lib/kadm5/unit-test/configure.in index 5686f081f..b8a73516f 100644 --- a/src/lib/kadm5/unit-test/configure.in +++ b/src/lib/kadm5/unit-test/configure.in @@ -2,12 +2,15 @@ AC_INIT(init-test.c) WITH_CCOPTS CONFIG_RULES KRB_INCLUDE +dnl The following are tests for the presence of programs required for testing AC_CHECK_PROG(RUNTEST,runtest,runtest) +AC_CHECK_PROG(PERL,perl,perl) AC_KRB5_TCL -if test "$TCL_LIB" != "" ; then - DO_TCL=tcl +if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then + DO_TEST=ok fi -AC_SUBST(DO_TCL) +AC_SUBST(DO_TEST) +dnl USE_KADMCLNT_LIBRARY USE_GSSAPI_LIBRARY USE_KADMSRV_LIBRARY -- 2.26.2