diff options
| author | Russ Allbery <rra@stanford.edu> | 2010-08-25 15:08:05 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2010-08-25 15:08:05 -0700 |
| commit | 468ded4c2fae05a815bef91bdcb17d52f9cdcb2b (patch) | |
| tree | b2b836734664367c03691a8594684187a1be4054 /tests/tap/kerberos.sh | |
| parent | 32dc393016f0b6241dbf8d405638e18a33bb9b62 (diff) | |
Update to rra-c-util 2.6 and C TAP Harness 1.5
Update to C TAP Harness 1.5:
* Better reporting of fatal errors in the test suite.
* Summarize results at the end of test execution.
* Add tests/HOWTO from docs/writing-tests in C TAP Harness.
Update to rra-c-util 2.6:
* Fix portability to bundled Heimdal on OpenBSD.
* Improve checking for krb5_kt_free_entry with older MIT Kerberos.
* Fix portability for missing krb5_get_init_creds_opt_free.
* Fix header guard for util/xwrite.h.
* Restore default compiler configuration after GSS-API library probe.
Diffstat (limited to 'tests/tap/kerberos.sh')
| -rw-r--r-- | tests/tap/kerberos.sh | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tests/tap/kerberos.sh b/tests/tap/kerberos.sh index fbeaaba..904cae5 100644 --- a/tests/tap/kerberos.sh +++ b/tests/tap/kerberos.sh @@ -1,4 +1,4 @@ -# Shell function library for Kerberos test support. +# Shell function library to initialize Kerberos credentials # # Written by Russ Allbery <rra@stanford.edu> # Copyright 2009, 2010 Board of Trustees, Leland Stanford Jr. University @@ -10,18 +10,9 @@ # configured. Sets the global principal variable to the principal to use. kerberos_setup () { local keytab - keytab='' - for f in "$BUILD/data/test.keytab" "$SOURCE/data/test.keytab" ; do - if [ -r "$f" ] ; then - keytab="$f" - fi - done - principal='' - for f in "$BUILD/data/test.principal" "$SOURCE/data/test.principal" ; do - if [ -r "$f" ] ; then - principal=`cat "$BUILD/data/test.principal"` - fi - done + keytab=`test_file_path data/test.keytab` + principal=`test_file_path data/test.principal` + principal=`cat "$principal" 2>/dev/null` if [ -z "$keytab" ] || [ -z "$principal" ] ; then return 1 fi |