diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-10-31 13:50:41 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-10-31 13:50:41 +0000 |
| commit | ead27415e29463246fef0a88f51ba6d78733b2c6 (patch) | |
| tree | 8bad3938d32bcc2a538391e1e60b5a098887bcd4 /src/lib/rpc/unit-test | |
| parent | c9829c72f16d7e0326c7201cc88471468ca480ad (diff) | |
| download | krb5-ead27415e29463246fef0a88f51ba6d78733b2c6.tar.gz krb5-ead27415e29463246fef0a88f51ba6d78733b2c6.tar.xz krb5-ead27415e29463246fef0a88f51ba6d78733b2c6.zip | |
* Makefile.in: Only run tests if required programs, libraries
available.
* configure.in: Check for runtest, Perl, and tcl before making checks.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9258 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc/unit-test')
| -rw-r--r-- | src/lib/rpc/unit-test/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/Makefile.in | 8 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/configure.in | 11 |
3 files changed, 26 insertions, 1 deletions
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index 2adbe1320..a5d21e8a5 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,11 @@ +Thu Oct 31 08:47:47 1996 Ezra Peisach <epeisach@mit.edu> + + * Makefile.in: Only run tests if required programs, libraries + available. + + * configure.in: Check for runtest, Perl, and tcl before making checks. + + Thu Oct 24 17:20:11 1996 Barry Jaspan <bjaspan@mit.edu> * Makefile.in, rpc_test_clnt.c, rpc_test_svc.c, rpc_test.h: diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in index 28e6862f5..57f75cdbc 100644 --- a/src/lib/rpc/unit-test/Makefile.in +++ b/src/lib/rpc/unit-test/Makefile.in @@ -24,7 +24,13 @@ client.c server.c: rpc_test.h # rm -f rpc_test.h rpc_test_clnt.c rpc_test_svc.c # -check unit-test:: unit-test-setup unit-test-body unit-test-cleanup +check unit-test:: unit-test-@DO_TEST@ + +unit-test-: + @echo "The rpc 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:: RPC_TEST_SRVTAB=/tmp/rpc_test_v5srvtab $(ENV_SETUP) \ diff --git a/src/lib/rpc/unit-test/configure.in b/src/lib/rpc/unit-test/configure.in index 1d02edc2e..5e2f1b8a3 100644 --- a/src/lib/rpc/unit-test/configure.in +++ b/src/lib/rpc/unit-test/configure.in @@ -2,9 +2,20 @@ AC_INIT(client.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 "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then + DO_TEST=ok +fi +AC_SUBST(DO_TEST) +dnl USE_GSSRPC_LIBRARY USE_GSSAPI_LIBRARY USE_DYN_LIBRARY V5_USE_SHARED_LIB KRB5_LIBRARIES + V5_AC_OUTPUT_MAKEFILE |