summaryrefslogtreecommitdiff
path: root/tests/tap/remctl.sh
diff options
context:
space:
mode:
authorRuss Allbery <rra@stanford.edu>2013-02-27 14:25:37 -0800
committerRuss Allbery <rra@stanford.edu>2013-02-27 16:52:32 -0800
commit234e3805c524a7432caed8be328df6e2fbfe9afb (patch)
treed40473e103f8cfacec000959c2ae3ea83e8e86b2 /tests/tap/remctl.sh
parent7a572127a7305a17bf84c26e66e65ab37f66b77d (diff)
Update to rra-c-util 4.8 and C TAP Harness 1.12
Update to rra-c-util 4.8: * Look for krb5-config in /usr/kerberos/bin after the user's PATH. * Kerberos library probing fixes without transitive shared libraries. * Fix Autoconf warnings when probing for AIX's bundled Kerberos. * Avoid using krb5-config if --with-{krb5,gssapi}-{include,lib} given. * Correctly remove -I/usr/include from Kerberos and GSS-API flags. * Build on systems where krb5/krb5.h exists but krb5.h does not. * Pass --deps to krb5-config unless --enable-reduced-depends was used. * Do not use krb5-config results unless gssapi is supported. * Fix probing for Heimdal's libroken to work with older versions. * Update warning flags for GCC 4.6.1. * Update utility library and test suite for newer GCC warnings. * Fix broken GCC attribute markers causing compilation problems. * Suppress warnings on compilers that support gcc's __attribute__. * Add notices to all files copied over from rra-c-util. * Fix warnings when reporting memory allocation failure in messages.c. * Fix message utility library compiler warnings on 64-bit systems. * Include strings.h for additional POSIX functions where found. * Use an atexit handler to clean up after Kerberos tests. * Kerberos test configuration now goes in tests/config. * The principal of the test keytab is determined automatically. * Simplify the test suite calls for Kerberos and remctl tests. * Check for a missing ssize_t. * Improve the xstrndup utility function. * Checked asprintf variants are now void functions and cannot fail. * Fix use of long long in portable/mkstemp.c. * Fix test suite portability to Solaris. * Substantial improvements to the POD syntax and spelling checks. Update to C TAP Harness 1.12: * Fix compliation of runtests with more aggressive warnings. * Add a more complete usage message and a -h command-line flag. * Flush stderr before printing output from tests. * Better handle running shell tests without BUILD and SOURCE set. * Fix runtests to honor -s even if BUILD and -b aren't given. * runtests now frees all allocated resources on exit. * Only use feature-test macros when requested or built with gcc -ansi. * Drop is_double from the C TAP library to avoid requiring -lm. * Avoid using local in the shell libtap.sh library. * Suppress warnings on compilers that support gcc's __attribute__. Change-Id: I394294d5486ac1ce265c7713bec71a148aaaf1ce Reviewed-on: https://gerrit.stanford.edu/841 Reviewed-by: Russ Allbery <rra@stanford.edu> Tested-by: Russ Allbery <rra@stanford.edu>
Diffstat (limited to 'tests/tap/remctl.sh')
-rw-r--r--tests/tap/remctl.sh61
1 files changed, 44 insertions, 17 deletions
diff --git a/tests/tap/remctl.sh b/tests/tap/remctl.sh
index 9e01bcf..2fd6681 100644
--- a/tests/tap/remctl.sh
+++ b/tests/tap/remctl.sh
@@ -1,40 +1,67 @@
# Shell function library to start and stop remctld
#
+# Note that while many of the functions in this library could benefit from
+# using "local" to avoid possibly hammering global variables, Solaris /bin/sh
+# doesn't support local and this library aspires to be portable to Solaris
+# Bourne shell. Instead, all private variables are prefixed with "tap_".
+#
+# The canonical version of this file is maintained in the rra-c-util package,
+# which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+#
# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2009 Board of Trustees, Leland Stanford Jr. University
+# Copyright 2009, 2012
+# The Board of Trustees of the Leland Stanford Junior University
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
#
-# See LICENSE for licensing terms.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
# Start remctld. Takes the path to remctld, which may be found via configure,
# and the path to the configuration file.
remctld_start () {
- local keytab principal
- rm -f "$BUILD/data/remctld.pid"
- 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
+ tap_pidfile=`test_tmpdir`/remctld.pid
+ rm -f "$tap_pidfile"
+ tap_keytab=`test_file_path config/keytab`
+ tap_principal=`test_file_path config/principal`
+ tap_principal=`cat "$tap_principal" 2>/dev/null`
+ if [ -z "$tap_keytab" ] || [ -z "$tap_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 \
- -S -F -k "$keytab" &)
+ -p 14373 -s "$tap_principal" -P "$tap_pidfile" -f "$2" -d -S -F \
+ -k "$tap_keytab" &)
[ -f "$BUILD/data/remctld.pid" ] || sleep 5
else
- ( "$1" -m -p 14373 -s "$principal" -P "$BUILD/data/remctld.pid" \
- -f "$2" -d -S -F -k "$keytab" &)
+ ( "$1" -m -p 14373 -s "$tap_principal" -P "$tap_pidfile" -f "$2" \
+ -d -S -F -k "$tap_keytab" &)
fi
- [ -f "$BUILD/data/remctld.pid" ] || sleep 1
- if [ ! -f "$BUILD/data/remctld.pid" ] ; then
+ [ -f "$tap_pidfile" ] || sleep 1
+ [ -f "$tap_pidfile" ] || sleep 1
+ if [ ! -f "$tap_pidfile" ] ; then
bail 'remctld did not start'
fi
}
# Stop remctld and clean up.
remctld_stop () {
- if [ -f "$BUILD/data/remctld.pid" ] ; then
- kill -TERM `cat "$BUILD/data/remctld.pid"`
- rm -f "$BUILD/data/remctld.pid"
+ tap_pidfile=`test_tmpdir`/remctld.pid
+ if [ -f "$tap_pidfile" ] ; then
+ kill -TERM `cat "$tap_pidfile"`
+ rm -f "$tap_pidfile"
fi
}