* Makefile.ov: update for new lib/kadm5 layout

	* api.1/lock.exp: jik's fix for lock test 13

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8949 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 30 insertions, 15 deletions

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 172084c20..6e2baca5d 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 16 17:16:46 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+	* Makefile.ov: update for new lib/kadm5 layout
+
+	* api.1/lock.exp: jik's fix for lock test 13
+
 Thu Jul 18 20:18:30 1996  Marc Horowitz  <marc@mit.edu>
 
 	* api.2/init-v2.exp (test150, test151): -s flag is now -S
diff --git a/src/lib/kadm5/unit-test/Makefile.ov b/src/lib/kadm5/unit-test/Makefile.ov
index 208bedeb3..d0c277afe 100644
--- a/src/lib/kadm5/unit-test/Makefile.ov
+++ b/src/lib/kadm5/unit-test/Makefile.ov
@@ -8,7 +8,7 @@ LIBS	:= 	$(LIBADMCLNT) $(LIBCOM_ERR) $(LIBRPCLIB) $(LIBDYN) \
 		$(LIBKRB5) $(LIBCRYPTO) $(LIBISODE) $(LIBTCL) $(LIBM) \
 		$(LIBDB) $(NDBMLIB) $(BSDLIB) $(NETLIB)
 
-INIT_SRCS =	init-test.c ../client_init.c
+INIT_SRCS =	init-test.c ../clnt/client_init.c
 DESTROY_SRCS =	destroy-test.c
 HANDLE_SRCS =	handle-test.c
 RANDKEY_SRCS =	randkey-test.c
@@ -20,8 +20,8 @@ PROG	=	init-test
 SRCS	=	$(INIT_SRCS)
 OBJS	=	init-test.o client_init.o
 
-client_init.o: ../client_init.c
-	$(CC) $(CFLAGS) -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I.. $<
+client_init.o: ../clnt/client_init.c
+	$(CC) $(CFLAGS) -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I.. -I../clnt $<
 
 expand Program
 
@@ -46,7 +46,7 @@ expand Program
 LIBS	:= 	$(LIBADMSRV) $(LIBCOM_ERR) $(LIBRPCLIB) $(LIBDYN) \
 		$(LIBGSSAPI_KRB5) $(LIBKDB5) $(LIBKRB5) \
 		$(LIBCRYPTO) $(LIBISODE) $(LIBTCL) $(LIBM) $(LIBDB) \
-		$(NDBMLIB) $(BSDLIB) $(NETLIB) 
+		$(NDBMLIB) $(BSDLIB) $(NETLIB) $(REGEXLIB)
 
 PROG	=	randkey-test
 SRCS	=	$(RANDKEY_SRCS)
diff --git a/src/lib/kadm5/unit-test/api.1/lock.exp b/src/lib/kadm5/unit-test/api.1/lock.exp
index 67ab80060..504a110ad 100644
--- a/src/lib/kadm5/unit-test/api.1/lock.exp
+++ b/src/lib/kadm5/unit-test/api.1/lock.exp
@@ -5,6 +5,8 @@
 
 source lib.t
 
+api_exit
+
 if { $RPC } {
     return
 }
@@ -65,6 +67,7 @@ proc lock_test_start {test cmds} {
 
 proc lock_test_continue {test my_spawn_id test_failed fail_output cont cmds} {
     global wait_error_index wait_errno_index wait_status_index
+    global spawn_id
 
     set spawn_id $my_spawn_id
 
@@ -229,14 +232,20 @@ lock_test 12.1 [list \
 	[list eof	0]]
 eval lock_test_continue $lock12
 
-# This test doesn't work yet, somehow I or expect am confused about
-# the spawn_id's between the lock-test and api.
-warning "test 13: doesn't work, bug in unit-test"
-# set lock13 [lock_test_start 13 [list \
-# 	[list "get lock13"	"Principal or policy does not exist"] \
-# 	[list wait	""] \
-# 	[list "get lock13"	retrieved] \
-# 	[list eof	0]]]
-# create_policy lock13
-# eval lock_test_continue $lock13
-# delete_policy lock13
+set lock13 [lock_test_start 13 [list \
+	[list "get lock13"	"Principal or policy does not exist"] \
+	[list wait	""] \
+	[list "get lock13"	retrieved] \
+	[list eof	0]]]
+set test13_spawn_id $spawn_id
+# create_policy could call api_exit immediately when it starts up.
+# If it does, and the spawn ID in $spawn_id is ours rather than its,
+# it'll close our spawn ID.  So, we call api_start to give it something
+# to close.
+api_start
+create_policy lock13
+set api_spawn_id $spawn_id
+set spawn_id $test13_spawn_id
+eval lock_test_continue $lock13
+set spawn_id $api_spawn_id
+delete_policy lock13