diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-11-10 14:46:49 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-11-10 14:46:49 +0000 |
| commit | 3ff6bebbc6eda694e9dc5777bd8f3fd07ff1e68d (patch) | |
| tree | 95ee84beedc249df99313532ef12eea7cca1bad9 /src | |
| parent | 6f731ceeeb3bcb27dc3c9450eacd3e1162b69a2a (diff) | |
| download | krb5-3ff6bebbc6eda694e9dc5777bd8f3fd07ff1e68d.tar.gz krb5-3ff6bebbc6eda694e9dc5777bd8f3fd07ff1e68d.tar.xz krb5-3ff6bebbc6eda694e9dc5777bd8f3fd07ff1e68d.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/passwd/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/passwd/unit-test/Makefile.in | 8 | ||||
| -rw-r--r-- | src/kadmin/passwd/unit-test/configure.in | 9 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog index 8ea7fa3211..0db6a37c80 100644 --- 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 76ca9e067e..72ddb0b478 100644 --- 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 4e13335e7c..f29c024907 100644 --- 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 |