diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1997-02-22 20:15:13 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1997-02-22 20:15:13 +0000 |
| commit | 12e5328273f1a123060e42e302ba6d676c94e35e (patch) | |
| tree | f819daef1454ef199915be7f59cc17a1aa2f1e9c /src/kadmin/v4server | |
| parent | ff7b21c51395cbee3f64e40dcabbe49373f6ea39 (diff) | |
| download | krb5-12e5328273f1a123060e42e302ba6d676c94e35e.zip krb5-12e5328273f1a123060e42e302ba6d676c94e35e.tar.gz krb5-12e5328273f1a123060e42e302ba6d676c94e35e.tar.bz2 | |
* configure.in: Do not run test suite unless Athena compatibility
is specified as well as tcl, Perl, runtest.
* Makefile.in (check): Do not run tests unless really setup to do so.
We probably will need to add more logic into this - such as
checking that /usr/athena/bin/kadmin exists and that we are running as root.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9961 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v4server')
| -rw-r--r-- | src/kadmin/v4server/unit-test/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/v4server/unit-test/Makefile.in | 10 | ||||
| -rw-r--r-- | src/kadmin/v4server/unit-test/configure.in | 14 |
3 files changed, 30 insertions, 1 deletions
diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog index 239af0f..b489175 100644 --- a/src/kadmin/v4server/unit-test/ChangeLog +++ b/src/kadmin/v4server/unit-test/ChangeLog @@ -1,3 +1,10 @@ +Sat Feb 22 15:12:17 1997 Ezra Peisach <epeisach@mit.edu> + + * configure.in: Do not run test suite unless Athena compatibility + is specified as well as tcl, Perl, runtest. + + * Makefile.in (check): Do not run tests unless really setup to do so. + Mon Nov 11 20:51:58 1996 Tom Yu <tlyu@mit.edu> * configure.in: Add AC_CANONICAL_HOST to deal with new pre.in. diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in index 0022556..dbb2454 100644 --- a/src/kadmin/v4server/unit-test/Makefile.in +++ b/src/kadmin/v4server/unit-test/Makefile.in @@ -2,7 +2,15 @@ # $Id$ # -check unit-test:: unit-test-setup unit-test-body unit-test-cleanup +check:: check-@DO_TEST@ + +check-:: + @echo "+++" + @echo "+++ WARNING: kadmin/v4server unit tests not run." + @echo "+++ Either Athena compatibility, tcl, runtest, or Perl is unavailable." + @echo "+++" + +check-ok unit-test:: unit-test-setup unit-test-body unit-test-cleanup unit-test-setup:: $(ENV_SETUP) $(START_SERVERS_LOCAL) -v4files -kdcport 750 -keysalt des-cbc-crc:v4 diff --git a/src/kadmin/v4server/unit-test/configure.in b/src/kadmin/v4server/unit-test/configure.in index 7f86ea2..a41c1c4 100644 --- a/src/kadmin/v4server/unit-test/configure.in +++ b/src/kadmin/v4server/unit-test/configure.in @@ -1,4 +1,18 @@ AC_INIT(getpid.sh) CONFIG_RULES AC_CANONICAL_HOST +ath_compat= +AC_ARG_ENABLE([athena], +[ --enable-athena build with MIT Project Athena configuration], +ath_compat=compat,) + +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 "$ath_compat" = compat -a "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then + DO_TEST=ok +fi +AC_SUBST(DO_TEST) +dnl V5_AC_OUTPUT_MAKEFILE |