Move test utilities out of dejagnu subdirectory

Move pkinit-certs, proxy-certs, and t_inetd.c from tests/dejagnu to
tests and repoint references at the new locations.

diff --git a/.gitignore b/.gitignore
index b40f4678ace332c21435c45fbb1879ece2b1f17a..c37b33d0cee7783be6f3c52a0050183933b7ee73 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -422,6 +422,7 @@ local.properties
 /src/tests/s2p
 /src/tests/s4u2proxy
 /src/tests/s4u2self
+/src/tests/t_inetd
 /src/tests/unlockiter
 
 /src/tests/asn.1/expected_encode.out
@@ -440,7 +441,6 @@ local.properties
 /src/tests/dejagnu/krb.sum
 /src/tests/dejagnu/runenv.vals
 /src/tests/dejagnu/site.exp
-/src/tests/dejagnu/t_inetd
 /src/tests/dejagnu/tmpdir/
 
 /src/tests/gss-threads/gss-client

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index ab416cc5fa5063268de6759d3161a287e6a426f6..02a3cc0a0253cd8575de928c99881153106dd352 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -8,10 +8,12 @@ RUN_DB_TEST = $(RUN_SETUP) KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf \
 
 OBJS= adata.o etinfo.o forward.o gcred.o hist.o hooks.o hrealm.o \
        icinterleave.o icred.o kdbtest.o localauth.o plugorder.o rdreq.o \
-       replay.o responder.o s2p.o s4u2self.o s4u2proxy.o unlockiter.o
+       replay.o responder.o s2p.o s4u2self.o s4u2proxy.o t_inetd.o \
+       unlockiter.o
 EXTRADEPSRCS= adata.c etinfo.c forward.c gcred.c hist.c hooks.c hrealm.c \
        icinterleave.c icred.c kdbtest.c localauth.c plugorder.c rdreq.c \
-       replay.c responder.c s2p.c s4u2self.c s4u2proxy.c unlockiter.c
+       replay.c responder.c s2p.c s4u2self.c s4u2proxy.c t_inetd.c \
+       unlockiter.c
 
 TEST_DB = ./testdb
 TEST_REALM = FOO.TEST.REALM
@@ -78,10 +80,15 @@ s4u2self: s4u2self.o $(KRB5_BASE_DEPLIBS)
 s4u2proxy: s4u2proxy.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o $@ s4u2proxy.o $(KRB5_BASE_LIBS)
 
+t_inetd: t_inetd.o $(KRB5_BASE_DEPLIBS)
+       $(CC_LINK) -o $@ t_inetd.o $(LIBS) $(KRB5_BASE_LIBS)
+
 unlockiter: unlockiter.o $(KDB5_DEPLIBS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o $@ unlockiter.o $(KDB5_LIBS) $(KADMSRV_LIBS) \
                $(KRB5_BASE_LIBS)
 
+all-unix: t_inetd
+
 check-unix: kdb_check
 
 kdc.conf: Makefile
@@ -184,7 +191,7 @@ check-pytests: unlockiter s4u2self
 clean:
        $(RM) adata etinfo forward gcred hist hooks hrealm icinterleave icred
        $(RM) kdbtest localauth plugorder rdreq replay responder s2p s4u2proxy
-       $(RM) unlockiter s4u2self
+       $(RM) s4u2self t_inetd unlockiter
        $(RM) krb5.conf kdc.conf
        $(RM) -rf kdc_realm/sandbox ldap
        $(RM) au.log

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index e78e270ed1530f7c6baafd86156096ac8d031a31..8c301c506af6aa3e1e2827f980efe3110599b480 100644 (file)
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -3,9 +3,7 @@ BUILDTOP=$(REL)..$(S)..
 RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =
 
-SRCS=$(srcdir)/t_inetd.c
-
-all: t_inetd
+all:
 
 install:
 
@@ -19,14 +17,11 @@ check-runtest-no:
        @echo 'Skipped dejagnu tests: runtest not found' >> $(SKIPTESTS)
 
 # Set VALGRIND at run time, that may be changed when running 'make'.
-check-runtest-yes: t_inetd site.exp
+check-runtest-yes: site.exp
        $(RUNTEST) --tool krb VALGRIND="$(VALGRIND)" $(RUNTESTFLAGS)
 
-t_inetd: t_inetd.o $(KRB5_BASE_DEPLIBS)
-       $(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS)
-
 clean:
-       $(RM) t_inetd t_inetd.o site.exp runenv.vars runenv.vals
+       $(RM) site.exp runenv.vars runenv.vals
 
 clean-unix::
        $(RM) -rf tmpdir dbg.log krb.log krb.sum

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 85bbf478a8c1e9f0b8e8b2886a1b81a67e679fc0..c298066fe811354a4808d90c56617144e65e28c6 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -303,7 +303,7 @@ foreach i {
     {KTUTIL $objdir/../../kadmin/ktutil/ktutil}
     {KLIST $objdir/../../clients/klist/klist}
     {KDESTROY $objdir/../../clients/kdestroy/kdestroy}
-    {T_INETD $objdir/t_inetd}
+    {T_INETD $objdir/../t_inetd}
     {KPROPLOG $objdir/../../kprop/kproplog}
     {KPASSWD $objdir/../../clients/kpasswd/kpasswd}
     {KPROPD $objdir/../../kprop/kpropd}
@@ -735,7 +735,7 @@ proc setup_krb5_conf { {type client} } {
     global srcdir
     global env
 
-    set pkinit_certs [findfile "[pwd]/$srcdir/pkinit-certs" "[pwd]/$srcdir/pkinit-certs" "$srcdir/pkinit-certs"]
+    set pkinit_certs [findfile "[pwd]/$srcdir/../pkinit-certs" "$srcdir/../pkinit-certs"]
     # Create a krb5.conf file.
     if { ![file exists $tmppwd/krb5.$type.conf] \
            || $last_passname_conf != $multipass_name } {

diff --git a/src/tests/dejagnu/deps b/src/tests/dejagnu/deps
index 5ad25386f3bb59ff7aa04e1bb46cfcf2c5c18a32..2feac3c9d38856b5efb7d0477f708535725a2640 100644 (file)
--- a/src/tests/dejagnu/deps
+++ b/src/tests/dejagnu/deps
@@ -1,5 +1 @@
-#
-# Generated makefile dependencies follow.
-#
-$(OUTPRE)t_inetd.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(COM_ERR_DEPS) t_inetd.c
+# No dependencies here.

diff --git a/src/tests/deps b/src/tests/deps
index 80284308c22b484914ce0254338a5ca7f88db3eb..2a6982ffb6b03387ba31f8976f35c67699c83cab 100644 (file)
--- a/src/tests/deps
+++ b/src/tests/deps
@@ -163,6 +163,8 @@ $(OUTPRE)s4u2proxy.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
   $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
   $(top_srcdir)/include/socket-utils.h s4u2proxy.c
+$(OUTPRE)t_inetd.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(COM_ERR_DEPS) t_inetd.c
 $(OUTPRE)unlockiter.$(OBJEXT): $(BUILDTOP)/include/gssapi/gssapi.h \
   $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/kadm5/admin.h \
   $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/kadm_err.h \

diff --git a/src/tests/dejagnu/pkinit-certs/ca.pem b/src/tests/pkinit-certs/ca.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/ca.pem
rename to src/tests/pkinit-certs/ca.pem

diff --git a/src/tests/dejagnu/pkinit-certs/generic.p12 b/src/tests/pkinit-certs/generic.p12
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/generic.p12
rename to src/tests/pkinit-certs/generic.p12

diff --git a/src/tests/dejagnu/pkinit-certs/generic.pem b/src/tests/pkinit-certs/generic.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/generic.pem
rename to src/tests/pkinit-certs/generic.pem

diff --git a/src/tests/dejagnu/pkinit-certs/kdc.pem b/src/tests/pkinit-certs/kdc.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/kdc.pem
rename to src/tests/pkinit-certs/kdc.pem

diff --git a/src/tests/dejagnu/pkinit-certs/make-certs.sh b/src/tests/pkinit-certs/make-certs.sh
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/make-certs.sh
rename to src/tests/pkinit-certs/make-certs.sh

diff --git a/src/tests/dejagnu/pkinit-certs/privkey-enc.pem b/src/tests/pkinit-certs/privkey-enc.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/privkey-enc.pem
rename to src/tests/pkinit-certs/privkey-enc.pem

diff --git a/src/tests/dejagnu/pkinit-certs/privkey.pem b/src/tests/pkinit-certs/privkey.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/privkey.pem
rename to src/tests/pkinit-certs/privkey.pem

diff --git a/src/tests/dejagnu/pkinit-certs/user-enc.p12 b/src/tests/pkinit-certs/user-enc.p12
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-enc.p12
rename to src/tests/pkinit-certs/user-enc.p12

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.p12 b/src/tests/pkinit-certs/user-upn.p12
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-upn.p12
rename to src/tests/pkinit-certs/user-upn.p12

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.pem b/src/tests/pkinit-certs/user-upn.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-upn.pem
rename to src/tests/pkinit-certs/user-upn.pem

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.p12 b/src/tests/pkinit-certs/user-upn2.p12
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-upn2.p12
rename to src/tests/pkinit-certs/user-upn2.p12

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.pem b/src/tests/pkinit-certs/user-upn2.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-upn2.pem
rename to src/tests/pkinit-certs/user-upn2.pem

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.p12 b/src/tests/pkinit-certs/user-upn3.p12
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-upn3.p12
rename to src/tests/pkinit-certs/user-upn3.p12

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.pem b/src/tests/pkinit-certs/user-upn3.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user-upn3.pem
rename to src/tests/pkinit-certs/user-upn3.pem

diff --git a/src/tests/dejagnu/pkinit-certs/user.p12 b/src/tests/pkinit-certs/user.p12
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user.p12
rename to src/tests/pkinit-certs/user.p12

diff --git a/src/tests/dejagnu/pkinit-certs/user.pem b/src/tests/pkinit-certs/user.pem
similarity index 100%
rename from src/tests/dejagnu/pkinit-certs/user.pem
rename to src/tests/pkinit-certs/user.pem

diff --git a/src/tests/dejagnu/proxy-certs/ca.pem b/src/tests/proxy-certs/ca.pem
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/ca.pem
rename to src/tests/proxy-certs/ca.pem

diff --git a/src/tests/dejagnu/proxy-certs/make-certs.sh b/src/tests/proxy-certs/make-certs.sh
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/make-certs.sh
rename to src/tests/proxy-certs/make-certs.sh

diff --git a/src/tests/dejagnu/proxy-certs/proxy-badsig.pem b/src/tests/proxy-certs/proxy-badsig.pem
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/proxy-badsig.pem
rename to src/tests/proxy-certs/proxy-badsig.pem

diff --git a/src/tests/dejagnu/proxy-certs/proxy-ideal.pem b/src/tests/proxy-certs/proxy-ideal.pem
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/proxy-ideal.pem
rename to src/tests/proxy-certs/proxy-ideal.pem

diff --git a/src/tests/dejagnu/proxy-certs/proxy-no-match.pem b/src/tests/proxy-certs/proxy-no-match.pem
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/proxy-no-match.pem
rename to src/tests/proxy-certs/proxy-no-match.pem

diff --git a/src/tests/dejagnu/proxy-certs/proxy-san.pem b/src/tests/proxy-certs/proxy-san.pem
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/proxy-san.pem
rename to src/tests/proxy-certs/proxy-san.pem

diff --git a/src/tests/dejagnu/proxy-certs/proxy-subject.pem b/src/tests/proxy-certs/proxy-subject.pem
similarity index 100%
rename from src/tests/dejagnu/proxy-certs/proxy-subject.pem
rename to src/tests/proxy-certs/proxy-subject.pem

diff --git a/src/tests/t_authdata.py b/src/tests/t_authdata.py
index 3fa957ad27686c61e0a2b53235c549f5dc7072c4..a1d7c7e37ed484a95b775656ea544c1e5bc582fa 100644 (file)
--- a/src/tests/t_authdata.py
+++ b/src/tests/t_authdata.py
@@ -57,7 +57,7 @@ if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
     skipped('anonymous ticket authdata tests', 'PKINIT not built')
 else:
     # Set up a realm with PKINIT support and get anonymous tickets.
-    certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs')
+    certs = os.path.join(srctop, 'tests', 'pkinit-certs')
     ca_pem = os.path.join(certs, 'ca.pem')
     kdc_pem = os.path.join(certs, 'kdc.pem')
     privkey_pem = os.path.join(certs, 'privkey.pem')

diff --git a/src/tests/t_certauth.py b/src/tests/t_certauth.py
index 0fe0fdb4a67472d58230502a3e11664c5a0d897f..c235e99b36888cb7d2996c8042b4b5066cd126b7 100644 (file)
--- a/src/tests/t_certauth.py
+++ b/src/tests/t_certauth.py
@@ -4,7 +4,7 @@ from k5test import *
 if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
     skip_rest('certauth tests', 'PKINIT module not built')
 
-certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs')
+certs = os.path.join(srctop, 'tests', 'pkinit-certs')
 ca_pem = os.path.join(certs, 'ca.pem')
 kdc_pem = os.path.join(certs, 'kdc.pem')
 privkey_pem = os.path.join(certs, 'privkey.pem')

diff --git a/src/tests/dejagnu/t_inetd.c b/src/tests/t_inetd.c
similarity index 99%
rename from src/tests/dejagnu/t_inetd.c
rename to src/tests/t_inetd.c
index 9164bbb851b90aecacc41d801fb4062d3c2d7212..e23c6b9d6601facc28baf3d0783dec80de6326ec 100644 (file)
--- a/src/tests/dejagnu/t_inetd.c
+++ b/src/tests/t_inetd.c
@@ -1,5 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* tests/dejagnu/t_inetd.c */
+/* tests/t_inetd.c */
 /*
  * Copyright 1991 by the Massachusetts Institute of Technology.
  * All Rights Reserved.

diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
index aee4da2b14a712564c86c5da73d37abd0c01d1b3..3d90e76c9ba3adb6f883c54bf2c8b5f99e5ae644 100755 (executable)
--- a/src/tests/t_pkinit.py
+++ b/src/tests/t_pkinit.py
@@ -7,7 +7,7 @@ if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
 soft_pkcs11 = os.path.join(buildtop, 'tests', 'softpkcs11', 'softpkcs11.so')
 
 # Construct a krb5.conf fragment configuring pkinit.
-certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs')
+certs = os.path.join(srctop, 'tests', 'pkinit-certs')
 ca_pem = os.path.join(certs, 'ca.pem')
 kdc_pem = os.path.join(certs, 'kdc.pem')
 user_pem = os.path.join(certs, 'user.pem')

diff --git a/src/tests/t_proxy.py b/src/tests/t_proxy.py
index 3069eaa8f03542d9a58a365e69c6733d951e41e2..cbd592a3fe4d1c2bd07dadfde5fb2c03bbb04e41 100755 (executable)
--- a/src/tests/t_proxy.py
+++ b/src/tests/t_proxy.py
@@ -10,17 +10,13 @@ except:
 
 # Construct a krb5.conf fragment configuring the client to use a local proxy
 # server.
-proxysubjectpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
-                               'proxy-subject.pem')
-proxysanpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
-                           'proxy-san.pem')
-proxyidealpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
-                             'proxy-ideal.pem')
-proxywrongpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
-                             'proxy-no-match.pem')
-proxybadpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
-                           'proxy-badsig.pem')
-proxyca = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', 'ca.pem')
+proxycerts = os.path.join(srctop, 'tests', 'proxy-certs')
+proxysubjectpem = os.path.join(proxycerts, 'proxy-subject.pem')
+proxysanpem = os.path.join(proxycerts, 'proxy-san.pem')
+proxyidealpem = os.path.join(proxycerts, 'proxy-ideal.pem')
+proxywrongpem = os.path.join(proxycerts, 'proxy-no-match.pem')
+proxybadpem = os.path.join(proxycerts, 'proxy-badsig.pem')
+proxyca = os.path.join(proxycerts, 'ca.pem')
 proxyurl = 'https://localhost:$port5/KdcProxy'
 proxyurlupcase = 'https://LocalHost:$port5/KdcProxy'
 proxyurl4 = 'https://127.0.0.1:$port5/KdcProxy'

diff --git a/src/util/k5test.py b/src/util/k5test.py
index e41bf36ccef684a087dd7094dc88a4bd3dbf56c9..9a9151b1951fef1adbdff58e475c7763d05b0fae 100644 (file)
--- a/src/util/k5test.py
+++ b/src/util/k5test.py
@@ -1397,7 +1397,7 @@ kswitch = os.path.join(buildtop, 'clients', 'kswitch', 'kswitch')
 kvno = os.path.join(buildtop, 'clients', 'kvno', 'kvno')
 kdestroy = os.path.join(buildtop, 'clients', 'kdestroy', 'kdestroy')
 kpasswd = os.path.join(buildtop, 'clients', 'kpasswd', 'kpasswd')
-t_inetd = os.path.join(buildtop, 'tests', 'dejagnu', 't_inetd')
+t_inetd = os.path.join(buildtop, 'tests', 't_inetd')
 kproplog = os.path.join(buildtop, 'kprop', 'kproplog')
 kpropd = os.path.join(buildtop, 'kprop', 'kpropd')
 kprop = os.path.join(buildtop, 'kprop', 'kprop')