svn commit: lorikeet r604 - in trunk/heimdal/tests: db gss kdc
lha at samba.org
lha at samba.org
Thu Oct 19 11:48:20 GMT 2006
Author: lha
Date: 2006-10-19 11:48:20 +0000 (Thu, 19 Oct 2006)
New Revision: 604
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=604
Log:
merge from heimdal cvs - add check if there is a buildin database that is useable
Added:
trunk/heimdal/tests/db/have-db.in
Modified:
trunk/heimdal/tests/db/Makefile.am
trunk/heimdal/tests/db/add-modify-delete.in
trunk/heimdal/tests/db/loaddump-db.in
trunk/heimdal/tests/gss/check-gssmask.in
trunk/heimdal/tests/kdc/check-digest.in
trunk/heimdal/tests/kdc/check-kdc.in
Changeset:
Modified: trunk/heimdal/tests/db/Makefile.am
===================================================================
--- trunk/heimdal/tests/db/Makefile.am 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/db/Makefile.am 2006-10-19 11:48:20 UTC (rev 604)
@@ -1,10 +1,10 @@
-# $Id: Makefile.am,v 1.4 2006/10/07 09:31:46 lha Exp $
+# $Id: Makefile.am,v 1.5 2006/10/19 06:54:33 lha Exp $
include $(top_srcdir)/Makefile.am.common
noinst_DATA = krb5.conf
-check_SCRIPTS = loaddump-db add-modify-delete
+check_SCRIPTS = have-db loaddump-db add-modify-delete
TESTS = loaddump-db add-modify-delete
@@ -21,6 +21,11 @@
chmod +x add-modify-delete.tmp
mv add-modify-delete.tmp add-modify-delete
+have-db: have-db.in Makefile
+ $(do_subst) < $(srcdir)/have-db.in > have-db.tmp
+ chmod +x have-db.tmp
+ mv have-db.tmp have-db
+
krb5.conf: krb5.conf.in Makefile
$(do_subst) < $(srcdir)/krb5.conf.in > krb5.conf.tmp
mv krb5.conf.tmp krb5.conf
Modified: trunk/heimdal/tests/db/add-modify-delete.in
===================================================================
--- trunk/heimdal/tests/db/add-modify-delete.in 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/db/add-modify-delete.in 2006-10-19 11:48:20 UTC (rev 604)
@@ -31,12 +31,15 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: add-modify-delete.in,v 1.3 2006/10/10 09:30:16 lha Exp $
+# $Id: add-modify-delete.in,v 1.4 2006/10/19 06:53:33 lha Exp $
#
srcdir="@srcdir@"
objdir="@objdir@"
+# If there is no useful db support compile in, disable test
+./have-db || exit 77
+
R=EXAMPLE.ORG
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
Added: trunk/heimdal/tests/db/have-db.in
===================================================================
--- trunk/heimdal/tests/db/have-db.in 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/db/have-db.in 2006-10-19 11:48:20 UTC (rev 604)
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Kungliga Tekniska Högskolan
+# (Royal Institute of Technology, Stockholm, Sweden).
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the Institute nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $Id: have-db.in,v 1.1 2006/10/19 06:51:48 lha Exp $
+#
+
+srcdir="@srcdir@"
+base=`dirname "$0"`
+
+kdc="${base}/../../kdc/kdc"
+
+list=`${kdc} --builtin-hdb | sed 's/^builtin hdb backends: //'`
+oldIFS="$IFS"
+IPS=,
+set - ${list}
+IFS="$oldIFS"
+
+while [ $# != 0 ] ; do
+ case $1 in
+ db:*) exit 0 ;;
+ ndbm:*) exit 0 ;;
+ gdbm:*) exit 0 ;;
+ db4:*) exit 0 ;;
+ db3:*) exit 0 ;;
+ ldb:*) exit 0 ;;
+ esac
+ shift
+done
+
+exit 1
\ No newline at end of file
Modified: trunk/heimdal/tests/db/loaddump-db.in
===================================================================
--- trunk/heimdal/tests/db/loaddump-db.in 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/db/loaddump-db.in 2006-10-19 11:48:20 UTC (rev 604)
@@ -31,12 +31,15 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: loaddump-db.in,v 1.2 2005/11/30 12:22:38 lha Exp $
+# $Id: loaddump-db.in,v 1.3 2006/10/19 06:53:08 lha Exp $
#
srcdir="@srcdir@"
objdir="@objdir@"
+# If there is no useful db support compile in, disable test
+./have-db || exit 77
+
R=EXAMPLE.ORG
kadmin="../../kadmin/kadmin -l -r $R"
Modified: trunk/heimdal/tests/gss/check-gssmask.in
===================================================================
--- trunk/heimdal/tests/gss/check-gssmask.in 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/gss/check-gssmask.in 2006-10-19 11:48:20 UTC (rev 604)
@@ -31,12 +31,15 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: check-gssmask.in,v 1.6 2006/10/17 20:08:38 lha Exp $
+# $Id: check-gssmask.in,v 1.7 2006/10/19 07:09:11 lha Exp $
#
srcdir="@srcdir@"
objdir="@objdir@"
+# If there is no useful db support compile in, disable test
+./have-db || exit 77
+
R=EXAMPLE.ORG
port=8888
Modified: trunk/heimdal/tests/kdc/check-digest.in
===================================================================
--- trunk/heimdal/tests/kdc/check-digest.in 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/kdc/check-digest.in 2006-10-19 11:48:20 UTC (rev 604)
@@ -31,12 +31,15 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: check-digest.in,v 1.6 2006/10/10 10:36:24 lha Exp $
+# $Id: check-digest.in,v 1.7 2006/10/19 07:05:06 lha Exp $
#
srcdir="@srcdir@"
objdir="@objdir@"
+# If there is no useful db support compile in, disable test
+./have-db || exit 77
+
R=EXAMPLE.ORG
port=8888
Modified: trunk/heimdal/tests/kdc/check-kdc.in
===================================================================
--- trunk/heimdal/tests/kdc/check-kdc.in 2006-10-19 11:43:47 UTC (rev 603)
+++ trunk/heimdal/tests/kdc/check-kdc.in 2006-10-19 11:48:20 UTC (rev 604)
@@ -31,12 +31,15 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: check-kdc.in,v 1.26 2006/10/19 04:27:33 lha Exp $
+# $Id: check-kdc.in,v 1.27 2006/10/19 06:55:00 lha Exp $
#
srcdir="@srcdir@"
objdir="@objdir@"
+# If there is no useful db support compile in, disable test
+./have-db || exit 77
+
R=EXAMPLE.ORG
R2=EXAMPLE.COM
More information about the samba-cvs
mailing list