Test for tcl, Perl, and runtest and only run tests if all are present

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

diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 8ea7fa3211a9e0e6db354eff5f8b5471553aaffe..0db6a37c80741f0205f45eff4d2d978a9e7a1619 100644 (file)
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 10 09:40:48 1996  Ezra Peisach  <epeisach@mit.edu>
+
+       * Makefile.in, configure.in: Check for Perl, tcl, and runtest and
+               only run tests if present.
+       
 Thu Sep 26 17:50:23 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * unit-test/Makefile.in, unit-test/kpasswd.0/principal.exp: use

diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index 76ca9e067e8ca878fc807b831fa5e9dc11c4de62..72ddb0b4782fbc0dfcda9f233c1992cc0eb07978 100644 (file)
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,4 +1,10 @@
-check unit-test:: unit-test-setup unit-test-body unit-test-cleanup
+check unit-test:: unit-test-@DO_TEST@
+
+unit-test-:
+       @echo "The kpasswd tests require Perl, Tcl, and runtest"
+       @echo "No tests run here"
+
+unit-test-ok:: unit-test-setup unit-test-body unit-test-cleanup
 
 unit-test-body::       
        $(ENV_SETUP) $(RUNTEST) --tool kpasswd KPASSWD=../kpasswd \

diff --git a/src/kadmin/passwd/unit-test/configure.in b/src/kadmin/passwd/unit-test/configure.in
index 4e13335e7cd61e9b76ca21e281bd9fa1bb1fba12..f29c02490757bbc7cc9eb549e4d77befe5839717 100644 (file)
--- a/src/kadmin/passwd/unit-test/configure.in
+++ b/src/kadmin/passwd/unit-test/configure.in
@@ -1,3 +1,12 @@
 AC_INIT(configure.in)
 CONFIG_RULES
+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 "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then
+       DO_TEST=ok
+fi
+AC_SUBST(DO_TEST) 
+dnl
 V5_AC_OUTPUT_MAKEFILE