From 468ded4c2fae05a815bef91bdcb17d52f9cdcb2b Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Wed, 25 Aug 2010 15:08:05 -0700
Subject: 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.
---
 tests/tap/remctl.sh | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'tests/tap/remctl.sh')

diff --git a/tests/tap/remctl.sh b/tests/tap/remctl.sh
index b9667ef..9e01bcf 100644
--- a/tests/tap/remctl.sh
+++ b/tests/tap/remctl.sh
@@ -10,18 +10,12 @@
 remctld_start () {
     local keytab principal
     rm -f "$BUILD/data/remctld.pid"
-    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
     if [ -n "$VALGRIND" ] ; then
         ( "$VALGRIND" --log-file=valgrind.%p --leak-check=full "$1" -m \
           -p 14373 -s "$principal" -P "$BUILD/data/remctld.pid" -f "$2" -d \
-- 
cgit v1.2.3