svn commit: lorikeet r631 - in trunk/heimdal/tests/db: .

[lha at samba.org]

Author: lha
Date: 2006-10-21 14:42:28 +0000 (Sat, 21 Oct 2006)
New Revision: 631

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=631

Log:
use EGREP (and add missing files)
Modified:
   trunk/heimdal/tests/db/Makefile.am
   trunk/heimdal/tests/db/add-modify-delete.in


Changeset:
Modified: trunk/heimdal/tests/db/Makefile.am
===================================================================
--- trunk/heimdal/tests/db/Makefile.am	2006-10-21 14:23:27 UTC (rev 630)
+++ trunk/heimdal/tests/db/Makefile.am	2006-10-21 14:42:28 UTC (rev 631)
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.5 2006/10/19 06:54:33 lha Exp $
+# $Id: Makefile.am,v 1.8 2006/10/21 14:40:11 lha Exp $
 
 include $(top_srcdir)/Makefile.am.common
 
@@ -9,7 +9,8 @@
 TESTS = loaddump-db add-modify-delete
 
 do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
-	-e 's,[@]objdir[@],$(top_builddir)/tests/db,g'
+	-e 's,[@]objdir[@],$(top_builddir)/tests/db,g' \
+	-e 's,[@]EGREP[@],$(EGREP),g' 
 
 loaddump-db: loaddump-db.in Makefile
 	$(do_subst) < $(srcdir)/loaddump-db.in > loaddump-db.tmp
@@ -33,6 +34,7 @@
 
 CLEANFILES= \
 	$(TESTS) \
+	have-db \
 	db-dump* \
 	current-db* \
 	out-text-dump* \
@@ -41,3 +43,14 @@
 	krb5.conf krb5.conf.tmp \
 	tempfile \
 	messages.log
+
+EXTRA_DIST = \
+	loaddump-db.in \
+	add-modify-delete.in \
+	have-db.in \
+	krb5.conf.in \
+	text-dump-0.7 \
+	text-dump-known-ext \
+	text-dump-no-ext \
+	text-dump-unknown-ext
+

Modified: trunk/heimdal/tests/db/add-modify-delete.in
===================================================================
--- trunk/heimdal/tests/db/add-modify-delete.in	2006-10-21 14:23:27 UTC (rev 630)
+++ trunk/heimdal/tests/db/add-modify-delete.in	2006-10-21 14:42:28 UTC (rev 631)
@@ -31,11 +31,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 # SUCH DAMAGE. 
 #
-# $Id: add-modify-delete.in,v 1.4 2006/10/19 06:53:33 lha Exp $
+# $Id: add-modify-delete.in,v 1.5 2006/10/21 14:40:39 lha Exp $
 #
 
 srcdir="@srcdir@"
 objdir="@objdir@"
+EGREP="@EGREP@"
 
 # If there is no useful db support compile in, disable test
 ./have-db || exit 77
@@ -61,19 +62,19 @@
 echo test add
 ${kadmin} add -r --use-defaults foo || exit 1
 ${kadmin} list '*' > /dev/null || exit 1
-${kadmin} list '*' | grep -e '^foo$' > /dev/null || exit 1
+${kadmin} list '*' | ${EGREP} '^foo$' > /dev/null || exit 1
 
 echo "test add (double)"
 ${kadmin} add -r --use-defaults foo 2>/dev/null && exit 1
 
 echo test rename
 ${kadmin} rename foo bar
-${kadmin} list '*' | grep -e '^foo$' > /dev/null && exit 1
-${kadmin} list '*' | grep -e '^bar$' > /dev/null || exit 1
+${kadmin} list '*' | ${EGREP} '^foo$' > /dev/null && exit 1
+${kadmin} list '*' | ${EGREP} '^bar$' > /dev/null || exit 1
 
 echo test delete
 ${kadmin} delete bar || exit 1
-${kadmin} list '*' | grep -e '^bar$' > /dev/null && exit 1
+${kadmin} list '*' | ${EGREP} '^bar$' > /dev/null && exit 1
 
 echo "test delete (double)"
 ${kadmin} delete bar 2> /dev/null && exit 1
@@ -82,30 +83,30 @@
 ${kadmin} add -r --use-defaults foo  || exit 1
 ${kadmin} get foo > tempfile  || exit 1
 echo checking principal
-grep -e " *Principal: foo at EXAMPLE.ORG$" tempfile > /dev/null || exit 1
+${EGREP} " *Principal: foo at EXAMPLE.ORG$" tempfile > /dev/null || exit 1
 echo checking kvno
-grep -e " *Kvno: 1$" tempfile > /dev/null || exit 1
+${EGREP} " *Kvno: 1$" tempfile > /dev/null || exit 1
 echo checking failed login count
-grep -e " *Failed login count: 0$" tempfile > /dev/null || exit 1
+${EGREP} " *Failed login count: 0$" tempfile > /dev/null || exit 1
 echo checking modifier
-grep -e " *Modifier: kadmin/admin at EXAMPLE.ORG$" tempfile > /dev/null || exit 1
+${EGREP} " *Modifier: kadmin/admin at EXAMPLE.ORG$" tempfile > /dev/null || exit 1
 echo checking attributes
-grep -e " *Attributes: $" tempfile > /dev/null || exit 1
+${EGREP} " *Attributes: $" tempfile > /dev/null || exit 1
 echo checking renew time
-grep -e " *Max renewable life: 1 week$" tempfile > /dev/null || exit 1
+${EGREP} " *Max renewable life: 1 week$" tempfile > /dev/null || exit 1
 
 echo modifing renewable-life
 ${kadmin} modify --max-renewable-life=2months foo
 echo checking renew time
 ${kadmin} get foo > tempfile  || exit 1
-grep -e " *Max renewable life: 2 months$" tempfile > /dev/null || exit 1
+${EGREP} " *Max renewable life: 2 months$" tempfile > /dev/null || exit 1
 
 echo "creating sample server"
 ${kadmin} add -r --use-defaults host/datan.example.org  || exit 1
 ${kadmin} get host/datan.example.org > tempfile  || exit 1
 echo checking principal
-grep -e " *Principal: host/datan.example.org at EXAMPLE.ORG$" tempfile > /dev/null || exit 1
+${EGREP} " *Principal: host/datan.example.org at EXAMPLE.ORG$" tempfile > /dev/null || exit 1
 echo checking kvno
-grep -e " *Kvno: 1$" tempfile > /dev/null || exit 1
+${EGREP} " *Kvno: 1$" tempfile > /dev/null || exit 1
 
 exit 0